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)
commit31fce91e7afc25c666276f65f019bc13fd27e216
tree24f9673614a98a06fd8f4254c63b306dddd5aac6
parent4640c7ee9b8953237d05a61ea3ea93981d1bc961
parent09503379dc99535b1bbfa51aa1aeef340f5d82ec
Merge remote-tracking branch 'efi/urgent' into x86/urgent

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>