Merge commit 'origin/master' into next

[safe/jmp/linux-2.6] / include / linux / reboot.h

diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 828ba4f..988e55f 100644 (file)
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -59,10 +59,24 @@ extern void machine_crash_shutdown(struct pt_regs *);
  * Architecture independent implemenations of sys_reboot commands.
  */
 
+extern void kernel_restart_prepare(char *cmd);
 extern void kernel_restart(char *cmd);
 extern void kernel_halt(void);
 extern void kernel_power_off(void);
-extern void kernel_kexec(void);
+
+void ctrl_alt_del(void);
+
+#define POWEROFF_CMD_PATH_LEN  256
+extern char poweroff_cmd[POWEROFF_CMD_PATH_LEN];
+
+extern int orderly_poweroff(bool force);
+
+/*
+ * Emergency restart, callable from an interrupt handler.
+ */
+
+extern void emergency_restart(void);
+#include <asm/emergency-restart.h>
 
 #endif