diff options
| author | Linus Torvalds | 2014-04-16 16:40:18 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2014-04-16 16:40:18 -0700 |
| commit | 6ca2a88ad820af56535ed1e6936e0490cb6ec6dc (patch) | |
| tree | b5873bb3f438a33e7c9d376d177b469461ca114d /include/linux | |
| parent | 2a83dc7e37045ecf6791bb98e7b91c3f761e5efe (diff) | |
| parent | 5be44a6fb1edb57d7d2d77151870dcd79c8c0e58 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Various fixes:
- reboot regression fix
- build message spam fix
- GPU quirk fix
- 'make kvmconfig' fix
plus the wire-up of the renameat2() system call on i386"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Remove the PCI reboot method from the default chain
x86/build: Supress "Nothing to be done for ..." messages
x86/gpu: Fix sign extension issue in Intel graphics stolen memory quirks
x86/platform: Fix "make O=dir kvmconfig"
i386: Wire up the renameat2() syscall
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/reboot.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/reboot.h b/include/linux/reboot.h index 9e7db9e73cc1..48bf152761c7 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h @@ -20,13 +20,13 @@ enum reboot_mode { extern enum reboot_mode reboot_mode; enum reboot_type { - BOOT_TRIPLE = 't', - BOOT_KBD = 'k', - BOOT_BIOS = 'b', - BOOT_ACPI = 'a', - BOOT_EFI = 'e', - BOOT_CF9 = 'p', - BOOT_CF9_COND = 'q', + BOOT_TRIPLE = 't', + BOOT_KBD = 'k', + BOOT_BIOS = 'b', + BOOT_ACPI = 'a', + BOOT_EFI = 'e', + BOOT_CF9_FORCE = 'p', + BOOT_CF9_SAFE = 'q', }; extern enum reboot_type reboot_type; |