summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/Makefile
diff options
context:
space:
mode:
authorKevin Winchester <kjwinchester@gmail.com>2011-08-30 20:41:05 -0300
committerIngo Molnar <mingo@elte.hu>2011-09-26 12:58:00 +0200
commitde0428a7ad4856c7b5b8a2792488ac893e6f3faa (patch)
tree63cf492f6e6a1b11aa8d4271df50b7c71649a49d /arch/x86/kernel/cpu/Makefile
parented3982cf3748b657ffb79d9d1c2e4a562661db2d (diff)
downloadblackbird-op-linux-de0428a7ad4856c7b5b8a2792488ac893e6f3faa.tar.gz
blackbird-op-linux-de0428a7ad4856c7b5b8a2792488ac893e6f3faa.zip
x86, perf: Clean up perf_event cpu code
The CPU support for perf events on x86 was implemented via included C files with #ifdefs. Clean this up by creating a new header file and compiling the vendor-specific files as needed. Signed-off-by: Kevin Winchester <kjwinchester@gmail.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1314747665-2090-1-git-send-email-kjwinchester@gmail.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/Makefile')
-rw-r--r--arch/x86/kernel/cpu/Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 6042981d0309..1044fd787db8 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -28,6 +28,11 @@ obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
obj-$(CONFIG_PERF_EVENTS) += perf_event.o
+ifdef CONFIG_PERF_EVENTS
+obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd.o
+obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_p4.o perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o
+endif
+
obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
OpenPOWER on IntegriCloud