---

yaml --- r: 269005 b: refs/heads/master c: de0428a h: refs/heads/master i: 269003: 56252b9 v: v3
git-mirror · Sep 26, 2011 · 3fcb8f5 · 3fcb8f5
1 parent cc3af31
commit 3fcb8f5
Show file tree

Hide file tree

Showing 10 changed files with 605 additions and 461 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed3982cf3748b657ffb79d9d1c2e4a562661db2d
+refs/heads/master: de0428a7ad4856c7b5b8a2792488ac893e6f3faa
diff --git a/trunk/arch/x86/kernel/cpu/Makefile b/trunk/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/