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

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

perf/x86: Move perf_event_intel_bts.c ........ => x86/events/intel/bts.c



Start moving the Intel bits.

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-2-git-send-email-bp@alien8.de


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

parent 7104f194

arch/x86/events/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5,3 +5,4 @@ obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o
	ifdef CONFIG_AMD_IOMMU		ifdef CONFIG_AMD_IOMMU
	obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o		obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o
	endif		endif
			obj-$(CONFIG_CPU_SUP_INTEL) += intel/bts.o

arch/x86/kernel/cpu/perf_event_intel_bts.c→arch/x86/events/intel/bts.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@
	#include <asm-generic/sizes.h>		#include <asm-generic/sizes.h>
	#include <asm/perf_event.h>		#include <asm/perf_event.h>

	#include "perf_event.h"		#include "../../kernel/cpu/perf_event.h"

	struct bts_ctx {		struct bts_ctx {
	struct perf_output_handle handle;		struct perf_output_handle handle;

arch/x86/kernel/cpu/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,7 @@ ifdef CONFIG_PERF_EVENTS
	obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_knc.o perf_event_p4.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_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		obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_rapl.o perf_event_intel_cqm.o
	obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_pt.o perf_event_intel_bts.o		obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_pt.o
	obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_cstate.o		obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_cstate.o

	obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore.o \		obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore.o \