On Wed, Aug 13, 2014 at 01:23:12AM -0700, tip-bot for Yan, Zheng wrote: > Commit-ID: c1e46580c3b7bf25053519cf39f01a2f9ea4d865 > Gitweb: http://git.kernel.org/tip/c1e46580c3b7bf25053519cf39f01a2f9ea4d865 > Author: Yan, Zheng <zheng.z.yan@xxxxxxxxx> > AuthorDate: Wed, 30 Jul 2014 15:22:15 +0800 > Committer: Ingo Molnar <mingo@xxxxxxxxxx> > CommitDate: Wed, 13 Aug 2014 07:51:08 +0200 > > perf/x86/uncore: move NHM-EX/WSM-EX specific code to seperate file > > Signed-off-by: Yan, Zheng <zheng.z.yan@xxxxxxxxx> > Signed-off-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx> > Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx> > Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> > Cc: Borislav Petkov <bp@xxxxxxx> > Cc: Paul Mackerras <paulus@xxxxxxxxx> > Cc: Stephane Eranian <eranian@xxxxxxxxxx> > Link: http://lkml.kernel.org/r/1406704935-27708-4-git-send-email-zheng.z.yan@xxxxxxxxx > Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> > --- > arch/x86/kernel/cpu/Makefile | 2 +- > arch/x86/kernel/cpu/perf_event_intel_uncore.c | 1038 +------------- > arch/x86/kernel/cpu/perf_event_intel_uncore.h | 185 +-- > ...el_uncore.c => perf_event_intel_uncore_nhmex.c} | 1483 +++----------------- > 4 files changed, 196 insertions(+), 2512 deletions(-) > > diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile > index 7dee866..7e1fd4e 100644 > --- a/arch/x86/kernel/cpu/Makefile > +++ b/arch/x86/kernel/cpu/Makefile > @@ -37,7 +37,7 @@ endif > obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_knc.o perf_event_p4.o > obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o > obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_uncore.o perf_event_intel_uncore_snb.o > -obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_uncore_snbep.o > +obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_uncore_snbep.o perf_event_intel_uncore_nhmex.o > obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_rapl.o These filenames are begging to go to a separate dir. arch/x86/perf/ would be a good one, peterz says. -- Regards/Gruss, Boris. Sent from a fat crate under my desk. Formatting is fine. -- -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html