Skip to contentSkip to conversation

EFI fixes

GIT PULL Ingo Molnar 1 participant 1 message Nov 14, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest efi-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-urgent-for-linus

# HEAD: f6697df36bdf0bf7fce984605c2918d4a7b4269f x86/efi: Prevent mixed mode boot corruption with CONFIG_VMAP_STACK=y

A boot crash fix and a build warning fix.

Thanks,

Ingo

------------------>
Borislav Petkov (1):
x86/efi: Fix EFI memmap pointer size warning

Matt Fleming (1):
x86/efi: Prevent mixed mode boot corruption with CONFIG_VMAP_STACK=y

 arch/x86/platform/efi/efi.c    |  2 +-
 arch/x86/platform/efi/efi_64.c | 80 ++++++++++++++++++++++++++++++------------
 2 files changed, 58 insertions(+), 24 deletions(-)
arch/x86/platform/efi/efi.c +1 -1
index bf99aa7005eb..936a488d6cf6 100644
@@ -861,7 +861,7 @@ static void __init __efi_enter_virtual_mode(void)
 	int count = 0, pg_shift = 0;
 	void *new_memmap = NULL;
 	efi_status_t status;
-	phys_addr_t pa;
+	unsigned long pa;
 
 	efi.systab = NULL;
 
arch/x86/platform/efi/efi_64.c +57 -23

158 lines not on this page · raw message