path: root/arch
diff options
authorVille Syrjälä <>2016-06-23 18:06:49 +0300
committerThomas Gleixner <>2016-07-06 12:51:59 +0200
commit175a20c16fdb7700fcac63f1eeb2caa7e1dddd2d (patch)
tree029776255c9ecf5fbc72fc4b12570a1fa5338e83 /arch
parentfc18822510721fe694d273c5211c71ea52796d76 (diff)
x86/perf/intel/rapl: Fix module name collision with powercap intel-rapl
Since commit 4b6e2571bf00 the rapl perf module calls itself intel-rapl. That name was already in use by the rapl powercap driver, which now fails to load if the perf module is loaded. Fix the problem by renaming the perf module to intel-rapl-perf, so that both modules can coexist. Fixes: 4b6e2571bf00 ("x86/perf/intel/rapl: Make the Intel RAPL PMU driver modular") Signed-off-by: Ville Syrjälä <> Cc: Vince Weaver <> Cc: Alexander Shishkin <> Cc: Kan Liang <> Cc: Stephane Eranian <> Cc: Arnaldo Carvalho de Melo <> Cc: Linus Torvalds <> Cc: Peter Zijlstra <> Cc: Jiri Olsa <> Link: Signed-off-by: Thomas Gleixner <>
Diffstat (limited to 'arch')
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/events/intel/Makefile b/arch/x86/events/intel/Makefile
index 3660b2c..06c2baa 100644
--- a/arch/x86/events/intel/Makefile
+++ b/arch/x86/events/intel/Makefile
@@ -1,8 +1,8 @@
obj-$(CONFIG_CPU_SUP_INTEL) += core.o bts.o cqm.o
obj-$(CONFIG_CPU_SUP_INTEL) += ds.o knc.o
obj-$(CONFIG_CPU_SUP_INTEL) += lbr.o p4.o p6.o pt.o
-obj-$(CONFIG_PERF_EVENTS_INTEL_RAPL) += intel-rapl.o
-intel-rapl-objs := rapl.o
+obj-$(CONFIG_PERF_EVENTS_INTEL_RAPL) += intel-rapl-perf.o
+intel-rapl-perf-objs := rapl.o
obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel-uncore.o
intel-uncore-objs := uncore.o uncore_nhmex.o uncore_snb.o uncore_snbep.o
obj-$(CONFIG_PERF_EVENTS_INTEL_CSTATE) += intel-cstate.o