diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-16 22:50:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-17 01:23:42 +0000 |
| commit | d1f7a4c0bfda09bebb1948e2169a6ce6a7319bd3 (patch) | |
| tree | 872faf5dcd234e04025a526e83e867a7855cb9b7 /include | |
| parent | c293f79246d7cdaf6e75b40aa1f957eb8d195835 (diff) | |
| parent | c0131386abdafa081356c1c02129df6413e685e0 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
arch/arm/include/asm/psci.h
arch/arm/kernel/psci.c
arch/arm/kernel/psci_smp.c
arch/arm/kernel/setup.c
arch/arm64/Kconfig
arch/arm64/include/asm/cpu_ops.h
arch/arm64/include/asm/pgtable.h
arch/arm64/include/asm/psci.h
arch/arm64/kernel/head.S
arch/arm64/kernel/psci.c
arch/arm64/kernel/ptrace.c
Diffstat (limited to 'include')
| -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 23b36304cd88..2ca9ed7cfc9b 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h @@ -10,6 +10,11 @@ #define SYS_HALT 0x0002 /* Notify of system halt */ #define SYS_POWER_OFF 0x0003 /* Notify of system power off */ +enum reboot_mode { + REBOOT_COLD = 0, + REBOOT_WARM, +}; + extern int register_reboot_notifier(struct notifier_block *); extern int unregister_reboot_notifier(struct notifier_block *); |