projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'edac_for_4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
[linux-2.6-microblaze.git]
/
arch
/
mips
/
kernel
/
cevt-r4k.c
diff --git
a/arch/mips/kernel/cevt-r4k.c
b/arch/mips/kernel/cevt-r4k.c
index
804d2a2
..
dd6a18b
100644
(file)
--- a/
arch/mips/kernel/cevt-r4k.c
+++ b/
arch/mips/kernel/cevt-r4k.c
@@
-80,7
+80,7
@@
static unsigned int calculate_min_delta(void)
}
/* Sorted insert of 75th percentile into buf2 */
- for (k = 0; k < i; ++k) {
+ for (k = 0; k < i
&& k < ARRAY_SIZE(buf2)
; ++k) {
if (buf1[ARRAY_SIZE(buf1) - 1] < buf2[k]) {
l = min_t(unsigned int,
i, ARRAY_SIZE(buf2) - 1);