summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorDave Young <dyoung@redhat.com>2014-08-14 17:15:26 +0800
committerMatt Fleming <matt.fleming@intel.com>2014-10-03 18:40:58 +0100
commitb2e0a54a1296a91b800f316df7bef7d1905e4fd0 (patch)
treeda46563d0e34f6d4d33c4952d73bb22576d47c6d /arch/x86
parent1282278ee00b41f314d1bce058a6b28b1bd49c21 (diff)
downloadlinux-b2e0a54a1296a91b800f316df7bef7d1905e4fd0.tar.gz
linux-b2e0a54a1296a91b800f316df7bef7d1905e4fd0.tar.bz2
linux-b2e0a54a1296a91b800f316df7bef7d1905e4fd0.zip
efi: Move noefi early param code out of x86 arch code
noefi param can be used for arches other than X86 later, thus move it out of x86 platform code. Signed-off-by: Dave Young <dyoung@redhat.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/platform/efi/efi.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index a1f745b0bf1d..c90d3cd2728c 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -70,14 +70,6 @@ static efi_config_table_type_t arch_tables[] __initdata = {
u64 efi_setup; /* efi setup_data physical address */
-static bool disable_runtime __initdata = false;
-static int __init setup_noefi(char *arg)
-{
- disable_runtime = true;
- return 0;
-}
-early_param("noefi", setup_noefi);
-
int add_efi_memmap;
EXPORT_SYMBOL(add_efi_memmap);
@@ -492,7 +484,7 @@ void __init efi_init(void)
if (!efi_runtime_supported())
pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n");
else {
- if (disable_runtime || efi_runtime_init())
+ if (efi_runtime_disabled() || efi_runtime_init())
return;
}
if (efi_memmap_init())