diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-18 17:39:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-18 17:39:05 -0700 |
| commit | ee114b97e67b2a572f94982567a21ac4ee17c133 (patch) | |
| tree | aeb03d95a6c09f39569f675a85c2029329e07c60 /arch/x86/platform/ce4100 | |
| parent | 4b8b8a4afa4f794a0029cdf2c13b6789fd38d9de (diff) | |
| parent | 4df05f361937ee86e5a8c9ead8aeb6a19ea9b7d7 (diff) | |
| download | linux-ee114b97e67b2a572f94982567a21ac4ee17c133.tar.gz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin: "Trying again to get the fixes queue, including the fixed IDT alignment patch. The UEFI patch is by far the biggest issue at hand: it is currently causing quite a few machines to boot. Which is sad, because the only reason they would is because their BIOSes touch memory that has already been freed. The other major issue is that we finally have tracked down the root cause of a significant number of machines failing to suspend/resume" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: Make sure IDT is page aligned x86, suspend: Handle CPUs which fail to #GP on RDMSR x86/platform/ce4100: Add header file for reboot type Revert "UEFI: Don't pass boot services regions to SetVirtualAddressMap()" efivars: check for EFI_RUNTIME_SERVICES
Diffstat (limited to 'arch/x86/platform/ce4100')
| -rw-r--r-- | arch/x86/platform/ce4100/ce4100.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c index baec704231b3..643b8b5eee86 100644 --- a/arch/x86/platform/ce4100/ce4100.c +++ b/arch/x86/platform/ce4100/ce4100.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/serial_reg.h> #include <linux/serial_8250.h> +#include <linux/reboot.h> #include <asm/ce4100.h> #include <asm/prom.h> |