Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / kernel / power / poweroff.c

diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
index d921459..7a4144b 100644 (file)
--- 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,11 +18,10 @@
 
 static void do_poweroff(void *dummy)
 {
-       if (pm_power_off)
-               pm_power_off();
+       kernel_power_off();
 }
 
-static DECLARE_WORK(poweroff_work, do_poweroff, 0);
+static DECLARE_WORK(poweroff_work, do_poweroff, NULL);
 
 static void handle_poweroff(int key, struct pt_regs *pt_regs,
                                struct tty_struct *tty)
@@ -32,7 +32,8 @@ static void handle_poweroff(int key, struct pt_regs *pt_regs,
 static struct sysrq_key_op     sysrq_poweroff_op = {
        .handler        = handle_poweroff,
        .help_msg       = "powerOff",
-       .action_msg     = "Power Off\n"
+       .action_msg     = "Power Off",
+       .enable_mask    = SYSRQ_ENABLE_BOOT,
 };
 
 static int pm_sysrq_init(void)