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

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

perf/x86: Move perf_event_amd_uncore.c .... => x86/events/amd/uncore.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/1454947748-28629-6-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5b26547d

arch/x86/events/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y			+= core.o



obj-$(CONFIG_CPU_SUP_AMD)               += amd/core.o

obj-$(CONFIG_CPU_SUP_AMD)               += amd/core.o amd/uncore.o

obj-$(CONFIG_X86_LOCAL_APIC)            += amd/ibs.o

ifdef CONFIG_AMD_IOMMU

obj-$(CONFIG_CPU_SUP_AMD)               += amd/iommu.o

arch/x86/kernel/cpu/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o 
obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o



ifdef CONFIG_PERF_EVENTS

obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_amd_uncore.o

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_rapl.o perf_event_intel_cqm.o