Commit 12dd00e8 authored Aug 26, 2015 by Leif Lindholm Committed by Matt Fleming Oct 12, 2015

efi/x86: Move efi=debug option parsing to core



fed6cefe ("x86/efi: Add a "debug" option to the efi= cmdline")
adds the DBG flag, but does so for x86 only. Move this early param
parsing to core code.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Mark Salter <msalter@redhat.com>
Cc: Borislav Petkov <bp@suse.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

parent 18aefbc5

arch/x86/platform/efi/efi.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -961,8 +961,6 @@ static int __init arch_parse_efi_cmdline(char *str)

		if (parse_option_str(str, "old_map"))
		set_bit(EFI_OLD_MEMMAP, &efi.flags);
		if (parse_option_str(str, "debug"))
		set_bit(EFI_DBG, &efi.flags);

		return 0;
		}

drivers/firmware/efi/efi.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,9 @@ static int __init parse_efi_cmdline(char *str)
		return -EINVAL;
		}

		if (parse_option_str(str, "debug"))
		set_bit(EFI_DBG, &efi.flags);

		if (parse_option_str(str, "noruntime"))
		disable_runtime = true;

Admin message