diff --git a/[refs] b/[refs]
index 448413615228..765e63d33920 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b438c44082d9f09fed10f3621fe8d5c93d3676d
+refs/heads/master: 9ecb1ff1b295a515b21d0ac83d8bd39b07335aab
diff --git a/trunk/arch/mips/gt64120/wrppmc/reset.c b/trunk/arch/mips/gt64120/wrppmc/reset.c
index c355cff38f6c..e66c87164a02 100644
--- a/trunk/arch/mips/gt64120/wrppmc/reset.c
+++ b/trunk/arch/mips/gt64120/wrppmc/reset.c
@@ -5,10 +5,12 @@
  *
  * Copyright (C) 1997 Ralf Baechle
  */
+#include <linux/irqflags.h>
 #include <linux/kernel.h>
 
 #include <asm/cacheflush.h>
 #include <asm/mipsregs.h>
+#include <asm/processor.h>
 
 void wrppmc_machine_restart(char *command)
 {
@@ -32,11 +34,8 @@ void wrppmc_machine_halt(void)
 
 	printk(KERN_NOTICE "You can safely turn off the power\n");
 	while (1) {
-		__asm__(
-			".set\tmips3\n\t"
-			"wait\n\t"
-			".set\tmips0"
-		);
+		if (cpu_wait)
+			cpu_wait();
 	}
 }