Commit 5656b408 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "Mostly tooling fixes, plus on the kernel side:

   - a revert for a newly introduced PMU driver which isn't complete yet
     and where we ran out of time with fixes (to be tried again in
     v3.19) - this makes up for a large chunk of the diffstat.

   - compilation warning fixes

   - a printk message fix

   - event_idx usage fixes/cleanups"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf probe: Trivial typo fix for --demangle
  perf tools: Fix report -F dso_from for data without branch info
  perf tools: Fix report -F dso_to for data without branch info
  perf tools: Fix report -F symbol_from for data without branch info
  perf tools: Fix report -F symbol_to for data without branch info
  perf tools: Fix report -F mispredict for data without branch info
  perf tools: Fix report -F in_tx for data without branch info
  perf tools: Fix report -F abort for data without branch info
  perf tools: Make CPUINFO_PROC an array to support different kernel versions
  perf callchain: Use global caching provided by libunwind
  perf/x86/intel: Revert incomplete and undocumented Broadwell client support
  perf/x86: Fix compile warnings for intel_uncore
  perf: Fix typos in sample code in the perf_event.h header
  perf: Fix and clean up initialization of pmu::event_idx
  perf: Fix bogus kernel printk
  perf diff: Add missing hists__init() call at tool start
parents c958f920 d785452c

arch/powerpc/perf/hv-24x7.c

+0 −6
Original line number Diff line number Diff line
@@ -417,11 +417,6 @@ static int h_24x7_event_add(struct perf_event *event, int flags) 
	return 0;

}



static int h_24x7_event_idx(struct perf_event *event)

{

	return 0;

}



static struct pmu h_24x7_pmu = {

	.task_ctx_nr = perf_invalid_context,
@@ -433,7 +428,6 @@ static struct pmu h_24x7_pmu = { 
	.start       = h_24x7_event_start,

	.stop        = h_24x7_event_stop,

	.read        = h_24x7_event_update,

	.event_idx   = h_24x7_event_idx,

};



static int hv_24x7_init(void)

arch/powerpc/perf/hv-gpci.c

+0 −6
Original line number Diff line number Diff line
@@ -246,11 +246,6 @@ static int h_gpci_event_init(struct perf_event *event) 
	return 0;

}



static int h_gpci_event_idx(struct perf_event *event)

{

	return 0;

}



static struct pmu h_gpci_pmu = {

	.task_ctx_nr = perf_invalid_context,
@@ -262,7 +257,6 @@ static struct pmu h_gpci_pmu = { 
	.start       = h_gpci_event_start,

	.stop        = h_gpci_event_stop,

	.read        = h_gpci_event_update,

	.event_idx   = h_gpci_event_idx,

};



static int hv_gpci_init(void)

arch/s390/kernel/perf_cpum_sf.c

+0 −6
Original line number Diff line number Diff line
@@ -1411,11 +1411,6 @@ static void cpumsf_pmu_del(struct perf_event *event, int flags) 
	perf_pmu_enable(event->pmu);

}



static int cpumsf_pmu_event_idx(struct perf_event *event)

{

	return event->hw.idx;

}



CPUMF_EVENT_ATTR(SF, SF_CYCLES_BASIC, PERF_EVENT_CPUM_SF);

CPUMF_EVENT_ATTR(SF, SF_CYCLES_BASIC_DIAG, PERF_EVENT_CPUM_SF_DIAG);
@@ -1458,7 +1453,6 @@ static struct pmu cpumf_sampling = { 
	.stop	      = cpumsf_pmu_stop,

	.read	      = cpumsf_pmu_read,



	.event_idx    = cpumsf_pmu_event_idx,

	.attr_groups  = cpumsf_pmu_attr_groups,

};

arch/x86/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,10 @@ config INSTRUCTION_DECODER 
	def_bool y

	depends on KPROBES || PERF_EVENTS || UPROBES



config PERF_EVENTS_INTEL_UNCORE

	def_bool y

	depends on PERF_EVENTS && SUP_SUP_INTEL && PCI



config OUTPUT_FORMAT

	string

	default "elf32-i386" if X86_32

arch/x86/kernel/cpu/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -39,9 +39,12 @@ obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd_iommu.o 
endif

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_p6.o perf_event_knc.o perf_event_p4.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_uncore.o perf_event_intel_uncore_snb.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_uncore_snbep.o perf_event_intel_uncore_nhmex.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o



obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore.o \

					   perf_event_intel_uncore_snb.o \

					   perf_event_intel_uncore_snbep.o \

					   perf_event_intel_uncore_nhmex.o

endif