git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
perf_event.c
diff --git
a/arch/arm/kernel/perf_event.c
b/arch/arm/kernel/perf_event.c
index
49643b1
..
07a5035
100644
(file)
--- a/
arch/arm/kernel/perf_event.c
+++ b/
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;