From d9fe4b2400f949154fa93c1116e0beef9f483cc7 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 2 Dec 2011 18:16:01 +0100
Subject: [PATCH] --- yaml --- r: 276626 b: refs/heads/master c:
 6bd054096dce061560cee0e016e292e588dc438f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fd4a8f19290f..a905f884702a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de66a979012dbc66b1ec0125795a3f79ee667b8a
+refs/heads/master: 6bd054096dce061560cee0e016e292e588dc438f
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index 8e9c98edc068..88b0941ce51e 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -640,6 +640,9 @@ static struct platform_device_id armpmu_plat_device_ids[] = {
 
 static int __devinit armpmu_device_probe(struct platform_device *pdev)
 {
+	if (!cpu_pmu)
+		return -ENODEV;
+
 	cpu_pmu->plat_device = pdev;
 	return 0;
 }