summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-10 09:30:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-10 09:30:09 -0700
commit85ca7886f566ae387a57a37bc0ffab25e3e117b5 (patch)
treed170966b3352b3463669492648861795aad0fb92 /arch
parent7c8d20d40f29e7c08332d406d7a65678dece4627 (diff)
parent16106822b67e0a5eb228aebf47e33d6cad1e91b6 (diff)
downloadlinux-stable-85ca7886f566ae387a57a37bc0ffab25e3e117b5.tar.gz
linux-stable-85ca7886f566ae387a57a37bc0ffab25e3e117b5.tar.bz2
linux-stable-85ca7886f566ae387a57a37bc0ffab25e3e117b5.zip
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: Fix null pointer deref with SEND_SIG_FORCED perf: Fix signed comparison in perf_adjust_period() powerpc/oprofile: fix potential buffer overrun in op_model_cell.c perf symbols: Set the DSO long name when using symbol_conf.vmlinux_name
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/oprofile/op_model_cell.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c
index 2c9e52267292..7fd90d02d8c6 100644
--- a/arch/powerpc/oprofile/op_model_cell.c
+++ b/arch/powerpc/oprofile/op_model_cell.c
@@ -1077,7 +1077,7 @@ static int calculate_lfsr(int n)
index = ENTRIES-1;
/* make sure index is valid */
- if ((index > ENTRIES) || (index < 0))
+ if ((index >= ENTRIES) || (index < 0))
index = ENTRIES-1;
return initial_lfsr[index];