Merge branch 'oprofile/perf' into oprofile/core

Conflicts:
	arch/arm/oprofile/common.c

Signed-off-by: Robert Richter <robert.richter@amd.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index db5b56064687..fc512684423f 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -85,6 +85,11 @@ void __weak hw_perf_enable(void)		{ barrier(); }
 
 void __weak perf_event_print_debug(void)        { }
 
+extern __weak const char *perf_pmu_name(void)
+{
+        return "pmu";
+}
+
 static DEFINE_PER_CPU(int, perf_disable_count);
 
 void perf_disable(void)