Merge branch 'efi/urgent' into efi/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

arch/x86/platform/efi/efi_64.c

@@ -244,7 +244,7 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
 	 * text and allocate a new stack because we can't rely on the
 	 * stack pointer being < 4GB.
 	 */
-	if (!IS_ENABLED(CONFIG_EFI_MIXED))
+	if (!IS_ENABLED(CONFIG_EFI_MIXED) || efi_is_native())
 		return 0;
 
 	page = alloc_page(GFP_KERNEL|__GFP_DMA32);