x86/perf/intel/rapl: Fix module name collision with powercap intel-rapl
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 23 Jun 2016 15:06:49 +0000 (18:06 +0300)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 6 Jul 2016 10:51:59 +0000 (12:51 +0200)
commit175a20c16fdb7700fcac63f1eeb2caa7e1dddd2d
tree029776255c9ecf5fbc72fc4b12570a1fa5338e83
parentfc18822510721fe694d273c5211c71ea52796d76
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ä <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>
arch/x86/events/intel/Makefile