Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core

1 files changed, 5 insertions, 0 deletions

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 64507eaa2d9..1ec3916ffef 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -63,6 +63,11 @@ static atomic64_t perf_event_id;
 
 void __weak perf_event_print_debug(void)	{ }
 
+extern __weak const char *perf_pmu_name(void)
+{
+	return "pmu";
+}
+
 void perf_pmu_disable(struct pmu *pmu)
 {
 	int *count = this_cpu_ptr(pmu->pmu_disable_count);