From 62588df12cdf99ed8e19beffb16c4d44148bc823 Mon Sep 17 00:00:00 2001
From: Matt Fleming <matt@console-pimps.org>
Date: Sun, 3 Oct 2010 21:41:13 +0100
Subject: [PATCH] --- yaml --- r: 211915 b: refs/heads/master c:
 84c7991059c9c4530cc911137c5bf508a41ed129 h: refs/heads/master i:   211913:
 96e505fed5101da01ee4bb398afb8ce7d996d5d8   211911:
 201059789942c5b25c5c5443a7b39793a68b3477 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sh/kernel/perf_event.c | 9 +++++++++
 trunk/include/linux/perf_event.h  | 1 +
 trunk/kernel/perf_event.c         | 5 +++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f2e20fd609da..a29d1781317a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bf101ba42a1c89b5afbc7492e7647dae5e18735
+refs/heads/master: 84c7991059c9c4530cc911137c5bf508a41ed129
diff --git a/trunk/arch/sh/kernel/perf_event.c b/trunk/arch/sh/kernel/perf_event.c
index 2cb9ad59d4b1..55fe89bbdfe0 100644
--- a/trunk/arch/sh/kernel/perf_event.c
+++ b/trunk/arch/sh/kernel/perf_event.c
@@ -59,6 +59,15 @@ static inline int sh_pmu_initialized(void)
 	return !!sh_pmu;
 }
 
+const char *perf_pmu_name(void)
+{
+	if (!sh_pmu)
+		return NULL;
+
+	return sh_pmu->name;
+}
+EXPORT_SYMBOL_GPL(perf_pmu_name);
+
 int perf_num_counters(void)
 {
 	if (!sh_pmu)
diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h
index 1a0219247183..33f08dafda2f 100644
--- a/trunk/include/linux/perf_event.h
+++ b/trunk/include/linux/perf_event.h
@@ -850,6 +850,7 @@ extern int perf_max_events;
 extern const struct pmu *hw_perf_event_init(struct perf_event *event);
 
 extern int perf_num_counters(void);
+extern const char *perf_pmu_name(void);
 extern void perf_event_task_sched_in(struct task_struct *task);
 extern void perf_event_task_sched_out(struct task_struct *task, struct task_struct *next);
 extern void perf_event_task_tick(struct task_struct *task);
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 403d1804b198..e2534691db0d 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/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)