]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'efi-urgent' into x86/efi
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 11 Aug 2014 20:58:54 +0000 (13:58 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 11 Aug 2014 20:58:54 +0000 (13:58 -0700)
commit954ddd70bce80d00a60ff04da342dc2ae5f44fac
tree2bb16d5bceab26b92ea68c2b895ce4a353d9338a
parent9842b131250b83d2727636f82ebb701c5e90119a
parentb831822d2405fdb9f2f16720a45d8f68a5c95f2b
Merge tag 'efi-urgent' into x86/efi

 * Enforce CONFIG_RELOCATABLE for the x86 EFI boot stub, otherwise
   it's possible to overwrite random pieces of unallocated memory during
   kernel decompression, leading to machine resets.

Resolved Conflicts:
arch/x86/Kconfig

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/Kconfig
arch/x86/boot/header.S
drivers/firmware/efi/efi.c
drivers/firmware/efi/libstub/fdt.c