diff options
author | Robin Holt <holt@sgi.com> | 2013-07-08 19:01:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 13:33:29 -0400 |
commit | 1b3a5d02ee070c8f9943333b9b6370f486601e0f (patch) | |
tree | 0630bd988dc285ca3af7d3520826b5f0d9e42748 /include/linux/reboot.h | |
parent | 7b6d864b48d95e6ea1df7df64475b9cb9616dcf9 (diff) |
reboot: move arch/x86 reboot= handling to generic kernel
Merge together the unicore32, arm, and x86 reboot= command line
parameter handling.
Signed-off-by: Robin Holt <holt@sgi.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/reboot.h')
-rw-r--r-- | include/linux/reboot.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/reboot.h b/include/linux/reboot.h index 5a5d7f7e81b7..8e00f9f6f963 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h | |||
@@ -17,6 +17,23 @@ enum reboot_mode { | |||
17 | REBOOT_SOFT, | 17 | REBOOT_SOFT, |
18 | REBOOT_GPIO, | 18 | REBOOT_GPIO, |
19 | }; | 19 | }; |
20 | extern enum reboot_mode reboot_mode; | ||
21 | |||
22 | enum reboot_type { | ||
23 | BOOT_TRIPLE = 't', | ||
24 | BOOT_KBD = 'k', | ||
25 | BOOT_BIOS = 'b', | ||
26 | BOOT_ACPI = 'a', | ||
27 | BOOT_EFI = 'e', | ||
28 | BOOT_CF9 = 'p', | ||
29 | BOOT_CF9_COND = 'q', | ||
30 | }; | ||
31 | extern enum reboot_type reboot_type; | ||
32 | |||
33 | extern int reboot_default; | ||
34 | extern int reboot_cpu; | ||
35 | extern int reboot_force; | ||
36 | |||
20 | 37 | ||
21 | extern int register_reboot_notifier(struct notifier_block *); | 38 | extern int register_reboot_notifier(struct notifier_block *); |
22 | extern int unregister_reboot_notifier(struct notifier_block *); | 39 | extern int unregister_reboot_notifier(struct notifier_block *); |