---

yaml --- r: 332283 b: refs/heads/master c: 6d59180 h: refs/heads/master i: 332281: ec055b7 332279: 9a37658 v: v3
git-mirror · Aug 24, 2012 · 3581391 · 3581391
1 parent d9d48ad
commit 3581391
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64eaea4a84a14f0299b5c0bc400fa92c10512d07
+refs/heads/master: 6d591805917cbc691e34cb3f8a10fef5997889bf
diff --git a/trunk/arch/mips/bcm63xx/setup.c b/trunk/arch/mips/bcm63xx/setup.c
@@ -86,6 +86,9 @@ void bcm63xx_machine_reboot(void)
 	}
 
 	for (i = 0; i < 2; i++) {
+		if (!perf_regs[i])
+			break;
+
 		reg = bcm_perf_readl(perf_regs[i]);
 		if (BCMCPU_IS_6348()) {
 			reg &= ~EXTIRQ_CFG_MASK_ALL_6348;