]> Pileus Git - ~andy/linux/commitdiff
Merge remote-tracking branch 'efi/urgent' into x86/urgent
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 14 Feb 2014 19:11:18 +0000 (11:11 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 14 Feb 2014 19:11:18 +0000 (11:11 -0800)
There have been reports of EFI crashes since -rc1. The following two
commits fix known issues.

 * Fix boot failure on 32-bit EFI due to the recent EFI memmap changes
   merged during the merge window - Borislav Petkov

 * Avoid a crash during efi_bgrt_init() by detecting invalid BGRT
   headers based on the 'status' field.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

Trivial merge