diff options
author | Jeremy Fitzhardinge <jeremy@xensource.com> | 2007-07-17 21:37:02 -0400 |
---|---|---|
committer | Jeremy Fitzhardinge <jeremy@goop.org> | 2007-07-18 11:47:40 -0400 |
commit | 10a0a8d4e3f6bf2d077f94344441909abe670f5a (patch) | |
tree | b834c912629498e9fefb5958ee9965c414d32d69 /kernel/sysctl.c | |
parent | 0ab4dc92278a0f3816e486d6350c6652a72e06c8 (diff) |
Add common orderly_poweroff()
Various pieces of code around the kernel want to be able to trigger an
orderly poweroff. This pulls them together into a single
implementation.
By default the poweroff command is /sbin/poweroff, but it can be set
via sysctl: kernel/poweroff_cmd. This is split at whitespace, so it
can include command-line arguments.
This patch replaces four other instances of invoking either "poweroff"
or "shutdown -h now": two sbus drivers, and acpi thermal
management.
sparc64 has its own "powerd"; still need to determine whether it should
be replaced by orderly_poweroff().
Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com>
Acked-by: Len Brown <lenb@kernel.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 7063ebc6db05..44a1d699aad7 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <linux/syscalls.h> | 46 | #include <linux/syscalls.h> |
47 | #include <linux/nfs_fs.h> | 47 | #include <linux/nfs_fs.h> |
48 | #include <linux/acpi.h> | 48 | #include <linux/acpi.h> |
49 | #include <linux/reboot.h> | ||
49 | 50 | ||
50 | #include <asm/uaccess.h> | 51 | #include <asm/uaccess.h> |
51 | #include <asm/processor.h> | 52 | #include <asm/processor.h> |
@@ -705,6 +706,15 @@ static ctl_table kern_table[] = { | |||
705 | .proc_handler = &proc_dointvec, | 706 | .proc_handler = &proc_dointvec, |
706 | }, | 707 | }, |
707 | #endif | 708 | #endif |
709 | { | ||
710 | .ctl_name = CTL_UNNUMBERED, | ||
711 | .procname = "poweroff_cmd", | ||
712 | .data = &poweroff_cmd, | ||
713 | .maxlen = POWEROFF_CMD_PATH_LEN, | ||
714 | .mode = 0644, | ||
715 | .proc_handler = &proc_dostring, | ||
716 | .strategy = &sysctl_string, | ||
717 | }, | ||
708 | 718 | ||
709 | { .ctl_name = 0 } | 719 | { .ctl_name = 0 } |
710 | }; | 720 | }; |