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

Commit 65a27a35 authored Feb 10, 2016 by Borislav Petkov Committed by Ingo Molnar Feb 17, 2016

perf/x86: Move perf_event_msr.c .............. => x86/events/msr.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-17-git-send-email-bp@alien8.de


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 5e865ed4

arch/x86/events/Makefile

+2 −2

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

		obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o amd/uncore.o
		obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o
		obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o msr.o
		ifdef CONFIG_AMD_IOMMU
		obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o
		endif
		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/knc.o
		obj-$(CONFIG_CPU_SUP_INTEL) += intel/lbr.o intel/p4.o intel/p6.o intel/pt.o
		obj-$(CONFIG_CPU_SUP_INTEL) += intel/rapl.o
		obj-$(CONFIG_CPU_SUP_INTEL) += intel/rapl.o msr.o
		obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore.o intel/uncore_nhmex.o
		obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore_snb.o intel/uncore_snbep.o

arch/x86/kernel/cpu/perf_event_msr.c→arch/x86/events/msr.c

+0 −0

File moved.

arch/x86/kernel/cpu/Makefile

+0 −6

Original line number	Diff line number	Diff line
		@@ -30,12 +30,6 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o
		obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o
		obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o

		ifdef CONFIG_PERF_EVENTS
		obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_msr.o
		obj-$(CONFIG_CPU_SUP_AMD) += perf_event_msr.o
		endif


		obj-$(CONFIG_X86_MCE) += mcheck/
		obj-$(CONFIG_MTRR) += mtrr/
		obj-$(CONFIG_MICROCODE) += microcode/