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

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

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


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

arch/x86/events/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ 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/lbr.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/pt.o
 
obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/pt.o intel/rapl.o

arch/x86/kernel/cpu/perf_event_intel_rapl.c→arch/x86/events/intel/rapl.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#include <linux/slab.h>

#include <linux/perf_event.h>

#include <asm/cpu_device_id.h>

#include "perf_event.h"

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



/*

 * RAPL energy status counters

arch/x86/kernel/cpu/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 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_rapl.o



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

					   perf_event_intel_uncore_snb.o \