Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92553e40 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c 



Signed-off-by: default avatarBorislav 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: default avatarIngo Molnar <mingo@kernel.org>
parent 35bf705c

arch/x86/events/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c→arch/x86/events/intel/uncore_snb.c

+1 −1
Original line number Diff line number Diff line 
/* 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

arch/x86/kernel/cpu/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -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