Commit 74bcc249 authored May 23, 2014 by Leif Lindholm Committed by Matt Fleming May 23, 2014

arm64: efi: only attempt efi map setup if booting via EFI



Booting a kernel with CONFIG_EFI enabled on a non-EFI system caused
an oops with the current UEFI support code.
Add the required test to prevent this.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

parent 345c736e

arch/arm64/kernel/efi.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,9 @@ void __init efi_init(void)

		void __init efi_idmap_init(void)
		{
		if (!efi_enabled(EFI_BOOT))
		return;

		/* boot time idmap_pg_dir is incomplete, so fill in missing parts */
		efi_setup_idmap();
		}