From 0cb6dfdc856d53a4e6893b079e24af7a4cda6710 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 30 Apr 2010 11:34:26 +0100
Subject: [PATCH] --- yaml --- r: 191837 b: refs/heads/master c:
 929f5199448a67d41bb249d58815ef77bcd53622 h: refs/heads/master i:   191835:
 bd277e399da090fbd6b4a44e4e8eb45d2fad6ec2 v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/arm/include/asm/perf_event.h |  3 +++
 trunk/arch/arm/kernel/perf_event.c      | 12 ++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b5bfcaa4bf98..a29c90ce8526 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49e6a32f2f0876b6267584d9c7e0e213bca6e2b8
+refs/heads/master: 929f5199448a67d41bb249d58815ef77bcd53622
diff --git a/trunk/arch/arm/include/asm/perf_event.h b/trunk/arch/arm/include/asm/perf_event.h
index fa4b32625d37..48837e6d8887 100644
--- a/trunk/arch/arm/include/asm/perf_event.h
+++ b/trunk/arch/arm/include/asm/perf_event.h
@@ -42,4 +42,7 @@ enum arm_perf_pmu_ids {
 extern enum arm_perf_pmu_ids
 armpmu_get_pmu_id(void);
 
+extern int
+armpmu_get_max_events(void);
+
 #endif /* __ARM_PERF_EVENT_H__ */
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index 381f1211233e..c45768614c8a 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -111,6 +111,18 @@ armpmu_get_pmu_id(void)
 }
 EXPORT_SYMBOL_GPL(armpmu_get_pmu_id);
 
+int
+armpmu_get_max_events(void)
+{
+	int max_events = 0;
+
+	if (armpmu != NULL)
+		max_events = armpmu->num_events;
+
+	return max_events;
+}
+EXPORT_SYMBOL_GPL(armpmu_get_max_events);
+
 #define HW_OP_UNSUPPORTED		0xFFFF
 
 #define C(_x) \