From c2051242071b4960db1f2f366adb86a8fa113ea8 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Thu, 4 Nov 2010 18:23:50 +0100
Subject: [PATCH] --- yaml --- r: 221877 b: refs/heads/master c:
 c3b291d98878a5f25fee56255bcfa420e85dff59 h: refs/heads/master i:   221875:
 d06c907a595427ffc194dedc715e1a9e4cd236e9 v: v3

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

diff --git a/[refs] b/[refs]
index 0b629a2e57c3..8051bce76f0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d33aadbf8e9ba0b844c2a4a03723969c913ab03a
+refs/heads/master: c3b291d98878a5f25fee56255bcfa420e85dff59
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index 49643b1467e6..07a50357492a 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -1749,7 +1749,7 @@ static inline int armv7_pmnc_has_overflowed(unsigned long pmnc)
 static inline int armv7_pmnc_counter_has_overflowed(unsigned long pmnc,
 					enum armv7_counters counter)
 {
-	int ret;
+	int ret = 0;
 
 	if (counter == ARMV7_CYCLE_COUNTER)
 		ret = pmnc & ARMV7_FLAG_C;