2 files changed, 5 insertions, 12 deletions

diff --git a/arch/mips/gt64120/wrppmc/reset.c b/arch/mips/gt64120/wrppmc/reset.c
index c355cff38f6c..cc5474b24f06 100644
--- a/arch/mips/gt64120/wrppmc/reset.c
+++ b/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,15 +34,7 @@ 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();
         }
 }
-
-void wrppmc_machine_power_off(void)
-{
-        wrppmc_machine_halt();
-}
diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c
index 728ef6a80edd..ca65c84031a7 100644
--- a/arch/mips/gt64120/wrppmc/setup.c
+++ b/arch/mips/gt64120/wrppmc/setup.c
@@ -98,11 +98,10 @@ void __init plat_mem_setup(void)
 {
         extern void wrppmc_machine_restart(char *command);
         extern void wrppmc_machine_halt(void);
-        extern void wrppmc_machine_power_off(void);
 
         _machine_restart = wrppmc_machine_restart;
         _machine_halt    = wrppmc_machine_halt;
-        pm_power_off     = wrppmc_machine_power_off;
+        pm_power_off     = wrppmc_machine_halt;
 
         /* This makes the operations of 'in/out[bwl]' to the
          * physical address ( < KSEG0) can work via KSEG1