commit ec377ea90bdb205b4f400f7caca46fd968c6c93d
author John Newlin <jnewlin@google.com> Mon Oct 06 09:45:04 2014 -0700
committer John Newlin <jnewlin@google.com> Tue Oct 07 08:42:01 2014 -0700
tree 509b9ca51df1c2ca1b12947a7e819d627a506d96
parent 89708f5ab6e5ac3b155dd02d17d9122dccb89e9a

Fix for gcc 4.9.1

Change-Id: I0e92b06b1a2e7843828722411ffc574463c36730

arch/mips/brcmstb/memory.c

diff --git a/arch/mips/brcmstb/memory.c b/arch/mips/brcmstb/memory.c
index 8998ce0..7ac3c24 100644
--- a/arch/mips/brcmstb/memory.c
+++ b/arch/mips/brcmstb/memory.c
@@ -774,7 +774,9 @@
 		off++;
 		if (off >= PTRS_PER_PTE) {
 			off = 0;
-			pte = consistent_pte[++idx];
+			idx++;
+			BUG_ON(idx < 0 || idx >= ARRAY_SIZE(consistent_pte));
+			pte = consistent_pte[idx];
 		}
 	} while (size -= PAGE_SIZE);
 
@@ -816,7 +818,9 @@
 		off++;
 		if (off >= PTRS_PER_PTE) {
 			off = 0;
-			pte = consistent_pte[++idx];
+			idx++;
+			BUG_ON(idx < 0 || idx >= ARRAY_SIZE(consistent_pte));
+			pte = consistent_pte[idx];
 		}
 		addr += PAGE_SIZE;
 	} while (addr < c->vm_end);