Ville Syrjälä 175a20c16f x86/perf/intel/rapl: Fix module name collision with powercap intel-rapl ... Since commit 4b6e2571bf 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: 4b6e2571bf ("x86/perf/intel/rapl: Make the Intel RAPL PMU driver modular") Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Vince Weaver <vincent.weaver@maine.edu> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Kan Liang <kan.liang@intel.com> Cc: Stephane Eranian <eranian@google.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Jiri Olsa <jolsa@redhat.com> Link: http://lkml.kernel.org/r/1466694409-3620-1-git-send-email-ville.syrjala@linux.intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2016-07-06 12:51:59 +02:00
..
amd	Merge branch 'perf/urgent' into perf/core, to pick up fixes	2016-05-05 10:12:37 +02:00
intel	x86/perf/intel/rapl: Fix module name collision with powercap intel-rapl	2016-07-06 12:51:59 +02:00
Kconfig	perf/x86: Move Kconfig.perf and other perf configuration bits to events/Kconfig	2016-03-31 10:30:40 +02:00
Makefile	x86/perf/intel/uncore: Make the Intel uncore PMU driver modular	2016-03-31 10:30:34 +02:00
core.c	perf/x86: Fix 32-bit perf user callgraph collection	2016-07-03 10:43:00 +02:00
msr.c	Merge branch 'perf/urgent' into perf/core, to pick up fixes	2016-05-12 10:14:45 +02:00
perf_event.h	perf/x86/intel/pt: Bypass PT vs. LBR exclusivity if the core supports it	2016-05-05 10:16:28 +02:00