diff options
| -rw-r--r-- | arch/x86/events/Makefile | 1 | ||||
| -rw-r--r-- | arch/x86/events/amd/ibs.c (renamed from arch/x86/kernel/cpu/perf_event_amd_ibs.c) | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/Makefile | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index e0560b6dd77b..88f787350bf0 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | obj-y += core.o | 1 | obj-y += core.o |
| 2 | 2 | ||
| 3 | obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o | 3 | obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o |
| 4 | obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o | ||
diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/events/amd/ibs.c index aa12f9509cfb..a8abd082d932 100644 --- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c +++ b/arch/x86/events/amd/ibs.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <asm/apic.h> | 15 | #include <asm/apic.h> |
| 16 | 16 | ||
| 17 | #include "perf_event.h" | 17 | #include "../../kernel/cpu/perf_event.h" |
| 18 | 18 | ||
| 19 | static u32 ibs_caps; | 19 | static u32 ibs_caps; |
| 20 | 20 | ||
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index d549b02953ca..dddba2225ccd 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile | |||
| @@ -54,7 +54,7 @@ obj-$(CONFIG_X86_MCE) += mcheck/ | |||
| 54 | obj-$(CONFIG_MTRR) += mtrr/ | 54 | obj-$(CONFIG_MTRR) += mtrr/ |
| 55 | obj-$(CONFIG_MICROCODE) += microcode/ | 55 | obj-$(CONFIG_MICROCODE) += microcode/ |
| 56 | 56 | ||
| 57 | obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o perf_event_amd_ibs.o | 57 | obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o |
| 58 | 58 | ||
| 59 | obj-$(CONFIG_HYPERVISOR_GUEST) += vmware.o hypervisor.o mshyperv.o | 59 | obj-$(CONFIG_HYPERVISOR_GUEST) += vmware.o hypervisor.o mshyperv.o |
| 60 | 60 | ||
