3 files changed, 6 insertions, 9 deletions

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 3ec789c6b537..664eb0469b6e 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -59,16 +59,13 @@ static void power_down(suspend_disk_method_t mode)
                 error = pm_ops->enter(PM_SUSPEND_DISK);
                 break;
         case PM_DISK_SHUTDOWN:
-                printk("Powering off system\n");
-                device_shutdown();
-                machine_power_off();
+                kernel_power_off();
                 break;
         case PM_DISK_REBOOT:
-                device_shutdown();
-                machine_restart(NULL);
+                kernel_restart(NULL);
                 break;
         }
-        machine_halt();
+        kernel_halt();
         /* Valid image is on the disk, if we continue we risk serious data corruption
            after resume. */
         printk(KERN_CRIT "Please power me down manually\n");
diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
index 715081b2d829..7a4144ba3afd 100644
--- a/kernel/power/poweroff.c
+++ b/kernel/power/poweroff.c
@@ -9,6 +9,7 @@
 #include <linux/init.h>
 #include <linux/pm.h>
 #include <linux/workqueue.h>
+#include <linux/reboot.h>
 
 /*
  * When the user hits Sys-Rq o to power down the machine this is the
@@ -17,8 +18,7 @@
 
 static void do_poweroff(void *dummy)
 {
-        if (pm_power_off)
-                pm_power_off();
+        kernel_power_off();
 }
 
 static DECLARE_WORK(poweroff_work, do_poweroff, NULL);
diff --git a/kernel/power/smp.c b/kernel/power/smp.c
index bbe23079c62c..911fc62b8225 100644
--- a/kernel/power/smp.c
+++ b/kernel/power/smp.c
@@ -38,7 +38,7 @@ void disable_nonboot_cpus(void)
                 }
                 printk("Error taking cpu %d down: %d\n", cpu, error);
         }
-        BUG_ON(smp_processor_id() != 0);
+        BUG_ON(raw_smp_processor_id() != 0);
         if (error)
                 panic("cpus not sleeping");
 }