From 6bf2785621438d041dae506dcfddb21644c02945 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Thu, 17 Nov 2011 15:05:14 +0000
Subject: [PATCH] --- yaml --- r: 276147 b: refs/heads/master c:
 bce34d14428d35d9a06ddc10cd46ecef311764c9 h: refs/heads/master i:   276145:
 d0e02cf6b9f1afae01409d2194ec1dfb56717e93   276143:
 7070f894d1c47c754ed533126342331312f3189b v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/perf_event.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ce9f84e18ebd..3790d424d459 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14e25c5eeb90d4f61cc94933307d04a19738ad2f
+refs/heads/master: bce34d14428d35d9a06ddc10cd46ecef311764c9
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index 24e2347be6b1..e508066d3d64 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -343,8 +343,14 @@ validate_group(struct perf_event *event)
 {
 	struct perf_event *sibling, *leader = event->group_leader;
 	struct pmu_hw_events fake_pmu;
+	DECLARE_BITMAP(fake_used_mask, ARMPMU_MAX_HWEVENTS);
 
-	memset(&fake_pmu, 0, sizeof(fake_pmu));
+	/*
+	 * Initialise the fake PMU. We only need to populate the
+	 * used_mask for the purposes of validation.
+	 */
+	memset(fake_used_mask, 0, sizeof(fake_used_mask));
+	fake_pmu.used_mask = fake_used_mask;
 
 	if (!validate_event(&fake_pmu, leader))
 		return -ENOSPC;