From: Borislav Petkov <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Vince Weaver <[email protected]>
---
arch/x86/events/Makefile | 2 +-
arch/x86/{kernel/cpu/perf_event_intel_rapl.c => events/intel/rapl.c} | 2 +-
arch/x86/kernel/cpu/Makefile | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
rename arch/x86/{kernel/cpu/perf_event_intel_rapl.c => events/intel/rapl.c}
(99%)
diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 2a2f55d7b6f2..f68232c4de81 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -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
diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
b/arch/x86/events/intel/rapl.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_rapl.c
rename to arch/x86/events/intel/rapl.c
index 24a351ad628d..9541f50a534a 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -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
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 3d099eac0425..b06bc7f75648 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -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 \
--
2.3.5
