Commit 1a800589 authored Oct 16, 2015 by Ingo Molnar

Merge tag 'efi-urgent' of...

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi

 into x86/urgent

Pull EFI fix from Matt Fleming:

 - Ensure that the identity mapping in initial_page_table is updated
   to cover the entire kernel range. This fixes a triple fault on
   non-PAE kernels when booting on 32-bit EFI due to accessing an
   unmapped GDT in efi_call_phys_prolog(). (Paolo Bonzini)

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

parents 8a53554e f5f3497c

arch/x86/kernel/setup.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1173,6 +1173,14 @@ void __init setup_arch(char **cmdline_p)
		clone_pgd_range(initial_page_table + KERNEL_PGD_BOUNDARY,
		swapper_pg_dir + KERNEL_PGD_BOUNDARY,
		KERNEL_PGD_PTRS);

		/*
		* sync back low identity map too. It is used for example
		* in the 32-bit EFI stub.
		*/
		clone_pgd_range(initial_page_table,
		swapper_pg_dir + KERNEL_PGD_BOUNDARY,
		KERNEL_PGD_PTRS);
		#endif

		tboot_probe();