Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1336352
| From | tip-bot for Borislav Petkov <tipbot@zytor.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [tip:perf/core] perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c |
| Date | 2016-02-17 13:30 +0100 |
| Message-ID | <r39p0-6nX-17@gated-at.bofh.it> (permalink) |
| References | <r0zJ3-vX-53@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Commit-ID: 92553e40c6292408faa069b34a6db0dab4055080 Gitweb: http://git.kernel.org/tip/92553e40c6292408faa069b34a6db0dab4055080 Author: Borislav Petkov <bp@suse.de> AuthorDate: Wed, 10 Feb 2016 10:55:17 +0100 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Wed, 17 Feb 2016 10:11:26 +0100 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> --- arch/x86/events/Makefile | 1 + .../cpu/perf_event_intel_uncore_snb.c => events/intel/uncore_snb.c} | 2 +- arch/x86/kernel/cpu/Makefile | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 70aedfe..eb0d921 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_CPU_SUP_INTEL) += intel/core.o intel/bts.o intel/cqm.o obj-$(CONFIG_CPU_SUP_INTEL) += intel/cstate.o intel/ds.o intel/lbr.o obj-$(CONFIG_CPU_SUP_INTEL) += intel/pt.o intel/rapl.o obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore.o intel/uncore_nhmex.o +obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore_snb.o diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c b/arch/x86/events/intel/uncore_snb.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c rename to arch/x86/events/intel/uncore_snb.c index e0e41f5..2049d26 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c +++ b/arch/x86/events/intel/uncore_snb.c @@ -1,5 +1,5 @@ /* Nehalem/SandBridge/Haswell uncore support */ -#include "../../events/intel/uncore.h" +#include "uncore.h" /* Uncore IMC PCI IDs */ #define PCI_DEVICE_ID_INTEL_SNB_IMC 0x0100 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 316f53a..696d106 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 ifdef CONFIG_PERF_EVENTS obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_knc.o perf_event_p4.o -obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore_snb.o \ - perf_event_intel_uncore_snbep.o +obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore_snbep.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_msr.o obj-$(CONFIG_CPU_SUP_AMD) += perf_event_msr.o endif
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[PATCH 11/17] perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c Borislav Petkov <bp@alien8.de> - 2016-02-10 11:00 +0100 [tip:perf/core] perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c tip-bot for Borislav Petkov <tipbot@zytor.com> - 2016-02-17 13:30 +0100
csiph-web