Merge with /home/shaggy/git/linus-clean/

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

1 files changed, 0 insertions, 3 deletions

diff --git a/kernel/sys.c b/kernel/sys.c
index 8f255259ef9e..0bcaed6560ac 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -392,7 +392,6 @@ void kernel_kexec(void)
         }
         notifier_call_chain(&reboot_notifier_list, SYS_RESTART, NULL);
         system_state = SYSTEM_RESTART;
-        device_suspend(PMSG_FREEZE);
         device_shutdown();
         printk(KERN_EMERG "Starting new kernel\n");
         machine_shutdown();
@@ -405,7 +404,6 @@ void kernel_halt(void)
 {
         notifier_call_chain(&reboot_notifier_list, SYS_HALT, NULL);
         system_state = SYSTEM_HALT;
-        device_suspend(PMSG_SUSPEND);
         device_shutdown();
         printk(KERN_EMERG "System halted.\n");
         machine_halt();
@@ -416,7 +414,6 @@ void kernel_power_off(void)
 {
         notifier_call_chain(&reboot_notifier_list, SYS_POWER_OFF, NULL);
         system_state = SYSTEM_POWER_OFF;
-        device_suspend(PMSG_SUSPEND);
         device_shutdown();
         printk(KERN_EMERG "Power down.\n");
         machine_power_off();