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

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

perf/x86: Move perf_event_intel_ds.c ......... => x86/events/intel/ds.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-6-git-send-email-bp@alien8.de


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

parent 6aec1ad7

arch/x86/events/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,4 +6,4 @@ 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/core.o intel/bts.o intel/cqm.o		obj-$(CONFIG_CPU_SUP_INTEL) += intel/core.o intel/bts.o intel/cqm.o
	obj-$(CONFIG_CPU_SUP_INTEL) += intel/cstate.o		obj-$(CONFIG_CPU_SUP_INTEL) += intel/cstate.o intel/ds.o

arch/x86/kernel/cpu/perf_event_intel_ds.c→arch/x86/events/intel/ds.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@
	#include <asm/perf_event.h>		#include <asm/perf_event.h>
	#include <asm/insn.h>		#include <asm/insn.h>

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

	/* The size of a BTS record in bytes: */		/* The size of a BTS record in bytes: */
	#define BTS_RECORD_SIZE 24		#define BTS_RECORD_SIZE 24

arch/x86/kernel/cpu/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o

	ifdef CONFIG_PERF_EVENTS		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		obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_lbr.o
	obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_rapl.o		obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_rapl.o
	obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_pt.o		obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_pt.o