diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-02-18 14:40:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-18 14:40:40 +0100 |
| commit | 829bf7af647e489caa494cebdb2e4d455ec4644a (patch) | |
| tree | f8980bea7e8e62130cd477dd2ab32b54353448ab /arch/x86/include/asm/apic.h | |
| parent | Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | Revert "efi/libstub: Call get_memory_map() to obtain map and desc sizes" (diff) | |
| download | linux-dev-829bf7af647e489caa494cebdb2e4d455ec4644a.tar.xz linux-dev-829bf7af647e489caa494cebdb2e4d455ec4644a.zip | |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent
Pull EFI fixes from Matt Fleming:
" - Leave a valid 64-bit IDT installed during runtime EFI mixed mode
calls to avoid triple faults if an NMI/MCE is received.
- Revert Ard's change to the libstub get_memory_map() that went into
the v3.20 merge window because it causes boot regressions on Qemu and
Xen. "
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
0 files changed, 0 insertions, 0 deletions