summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2005-07-26 11:47:32 -0600
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-26 14:35:43 -0700
commitff31977782a05504f2586ec9e3e5ab4b09a4c893 (patch)
tree3cf1d3ab1be8688a4de9bca44d8dac276f6038e2
parent62b3a04d75d2dc9480d5ad3b60f4258e548a6a83 (diff)
downloadop-kernel-dev-ff31977782a05504f2586ec9e3e5ab4b09a4c893.zip
op-kernel-dev-ff31977782a05504f2586ec9e3e5ab4b09a4c893.tar.gz
[PATCH] Use kernel_power_off in sysrq-o
We already do all of the gymnastics to run from process context to call the power off code so call into the power off code cleanly. This especially helps acpi as part of it's shutdown logic should run acpi_shutdown called from device_shutdown which was not being called from here. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--kernel/power/poweroff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
index 715081b..7a4144b 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);
OpenPOWER on IntegriCloud