From 9169e02adf794558116e7a5b48cf4d861859594b Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Mon, 14 Jan 2013 17:27:35 +0000
Subject: [PATCH] --- yaml --- r: 351162 b: refs/heads/master c:
 1764c591dfed2ce7075465df0591ce9564ff37a1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d224184df85e..ffcefff8ffd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b953c9c159e99f5465dc05dc90ca405fe9a4436
+refs/heads/master: 1764c591dfed2ce7075465df0591ce9564ff37a1
diff --git a/trunk/arch/arm/kernel/perf_event_cpu.c b/trunk/arch/arm/kernel/perf_event_cpu.c
index efa52954d628..43496f600569 100644
--- a/trunk/arch/arm/kernel/perf_event_cpu.c
+++ b/trunk/arch/arm/kernel/perf_event_cpu.c
@@ -147,7 +147,7 @@ static void cpu_pmu_init(struct arm_pmu *cpu_pmu)
 	cpu_pmu->free_irq	= cpu_pmu_free_irq;
 
 	/* Ensure the PMU has sane values out of reset. */
-	if (cpu_pmu && cpu_pmu->reset)
+	if (cpu_pmu->reset)
 		on_each_cpu(cpu_pmu->reset, cpu_pmu, 1);
 }