From 35813913da0c6952da758b3bbd8c77120fb93ffb Mon Sep 17 00:00:00 2001
From: Maxime Bizon <mbizon@freebox.fr>
Date: Fri, 13 Jul 2012 07:46:04 +0000
Subject: [PATCH] --- yaml --- r: 332283 b: refs/heads/master c:
 6d591805917cbc691e34cb3f8a10fef5997889bf h: refs/heads/master i:   332281:
 ec055b70963331b837acf03c3af9e1255a02b3ff   332279:
 9a3765897adbf4786deb9c2db719dbde23ef45f0 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/mips/bcm63xx/setup.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 02b622e53ac2..ff4547f7a74f 100644
--- 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
index bd83836fa15e..314231be788c 100644
--- 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;