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

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

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


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

arch/x86/events/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o 
ifdef CONFIG_AMD_IOMMU

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

endif

obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/bts.o
 
obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/core.o intel/bts.o

arch/x86/kernel/cpu/perf_event_intel.c→arch/x86/events/intel/core.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <asm/hardirq.h>

#include <asm/apic.h>



#include "perf_event.h"

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



/*

 * Intel PerfMon, used on Core and later.

arch/x86/kernel/cpu/Makefile

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

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

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_cstate.o