Merge tag 'efi-urgent' into x86/urgent
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 25 Apr 2013 21:00:22 +0000 (14:00 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 25 Apr 2013 21:00:22 +0000 (14:00 -0700)
commit697dfd884438058b15032b0169887c742704434a
tree7f14e8e2b1d677d8dc326fd16cfee92282e79ae5
parent0fbd06761f5c17cc9b20e02af60fd7ee9c895996
parentf697036b93aa7345d4cbb3c854a76456c0ddac45
Merge tag 'efi-urgent' into x86/urgent

 * The EFI variable anti-bricking algorithm merged in -rc8 broke booting
   on some Apple machines because they implement EFI spec 1.10, which
   doesn't provide a QueryVariableInfo() runtime function and the logic
   used to check for the existence of that function was insufficient.
   Fix from Josh Boyer.

 * The anti-bricking algorithm also introduced a compiler warning on
   32-bit. Fix from Borislav Petkov.

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