| commit | 829bf7af647e489caa494cebdb2e4d455ec4644a | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Feb 18 14:40:40 2015 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Feb 18 14:40:40 2015 +0100 |
| tree | f8980bea7e8e62130cd477dd2ab32b54353448ab | |
| parent | e07e0d4cb0c4bfe822ec8491cc06269096a38bea [diff] | |
| parent | 43a9f69692b232d1c64c913a27507eb14a1c47fd [diff] |
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>