diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /include/linux/reboot.h | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'include/linux/reboot.h')
| -rw-r--r-- | include/linux/reboot.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/reboot.h b/include/linux/reboot.h index 1dd1c707311f..85ea63f462af 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h | |||
| @@ -67,6 +67,11 @@ extern void kernel_power_off(void); | |||
| 67 | 67 | ||
| 68 | void ctrl_alt_del(void); | 68 | void ctrl_alt_del(void); |
| 69 | 69 | ||
| 70 | #define POWEROFF_CMD_PATH_LEN 256 | ||
| 71 | extern char poweroff_cmd[POWEROFF_CMD_PATH_LEN]; | ||
| 72 | |||
| 73 | extern int orderly_poweroff(bool force); | ||
| 74 | |||
| 70 | /* | 75 | /* |
| 71 | * Emergency restart, callable from an interrupt handler. | 76 | * Emergency restart, callable from an interrupt handler. |
| 72 | */ | 77 | */ |