From 88ddb69565b8b655ad4188ae5e0482ea36f328bb Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Wed, 12 Dec 2007 22:23:13 +0900
Subject: [PATCH] --- yaml --- r: 78051 b: refs/heads/master c:
 167da469e521ec608f632137a63c827f175e2679 h: refs/heads/master i:   78049:
 928658268b1f4ce5abe5cbc29b0a6ea2582e8b64   78047:
 c42d67d7de381806eaa8900bdcfe8c425ef69629 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/mips/cobalt/reset.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5b2d72fcd58f..109777ce5d29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71466dd477c7a67d188d1d8310c7016a88531a04
+refs/heads/master: 167da469e521ec608f632137a63c827f175e2679
diff --git a/trunk/arch/mips/cobalt/reset.c b/trunk/arch/mips/cobalt/reset.c
index c3d1baa5bcf1..516b4428df4e 100644
--- a/trunk/arch/mips/cobalt/reset.c
+++ b/trunk/arch/mips/cobalt/reset.c
@@ -12,6 +12,8 @@
 #include <linux/io.h>
 #include <linux/leds.h>
 
+#include <asm/processor.h>
+
 #include <cobalt.h>
 
 #define RESET_PORT	((void __iomem *)CKSEG1ADDR(0x1c000000))
@@ -34,7 +36,10 @@ void cobalt_machine_halt(void)
 	led_trigger_event(power_off_led_trigger, LED_FULL);
 
 	local_irq_disable();
-	while (1) ;
+	while (1) {
+		if (cpu_wait)
+			cpu_wait();
+	}
 }
 
 void cobalt_machine_restart(char *command)