diff options
| author | Borislav Petkov <bp@suse.de> | 2016-02-10 04:55:17 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-17 04:11:26 -0500 |
| commit | 92553e40c6292408faa069b34a6db0dab4055080 (patch) | |
| tree | 2bb390c0b2c4ba036f894b4d9e197bd4c2d2d6ae /arch/x86/kernel/cpu/Makefile | |
| parent | 35bf705c25e875f40ff8ed6af415315335973977 (diff) | |
perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1455098123-11740-12-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/Makefile')
| -rw-r--r-- | arch/x86/kernel/cpu/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 316f53a7f942..696d106091db 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile | |||
| @@ -33,8 +33,7 @@ obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o | |||
| 33 | ifdef CONFIG_PERF_EVENTS | 33 | ifdef CONFIG_PERF_EVENTS |
| 34 | obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_knc.o perf_event_p4.o | 34 | obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_knc.o perf_event_p4.o |
| 35 | 35 | ||
| 36 | obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore_snb.o \ | 36 | obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore_snbep.o |
| 37 | perf_event_intel_uncore_snbep.o | ||
| 38 | obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_msr.o | 37 | obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_msr.o |
| 39 | obj-$(CONFIG_CPU_SUP_AMD) += perf_event_msr.o | 38 | obj-$(CONFIG_CPU_SUP_AMD) += perf_event_msr.o |
| 40 | endif | 39 | endif |
