Commit b2e0a54a authored by Dave Young's avatar Dave Young Committed by Matt Fleming

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: default avatarDave Young <dyoung@redhat.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 1282278e
...@@ -2169,7 +2169,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ...@@ -2169,7 +2169,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
nodsp [SH] Disable hardware DSP at boot time. nodsp [SH] Disable hardware DSP at boot time.
noefi [X86] Disable EFI runtime services support. noefi Disable EFI runtime services support.
noexec [IA-64] noexec [IA-64]
......
...@@ -70,14 +70,6 @@ static efi_config_table_type_t arch_tables[] __initdata = { ...@@ -70,14 +70,6 @@ static efi_config_table_type_t arch_tables[] __initdata = {
u64 efi_setup; /* efi setup_data physical address */ 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; int add_efi_memmap;
EXPORT_SYMBOL(add_efi_memmap); EXPORT_SYMBOL(add_efi_memmap);
...@@ -492,7 +484,7 @@ void __init efi_init(void) ...@@ -492,7 +484,7 @@ void __init efi_init(void)
if (!efi_runtime_supported()) if (!efi_runtime_supported())
pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n"); pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n");
else { else {
if (disable_runtime || efi_runtime_init()) if (efi_runtime_disabled() || efi_runtime_init())
return; return;
} }
if (efi_memmap_init()) if (efi_memmap_init())
......
...@@ -41,6 +41,19 @@ struct efi __read_mostly efi = { ...@@ -41,6 +41,19 @@ struct efi __read_mostly efi = {
}; };
EXPORT_SYMBOL(efi); EXPORT_SYMBOL(efi);
static bool disable_runtime;
static int __init setup_noefi(char *arg)
{
disable_runtime = true;
return 0;
}
early_param("noefi", setup_noefi);
bool efi_runtime_disabled(void)
{
return disable_runtime;
}
static struct kobject *efi_kobj; static struct kobject *efi_kobj;
static struct kobject *efivars_kobj; static struct kobject *efivars_kobj;
......
...@@ -1229,4 +1229,5 @@ efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg, ...@@ -1229,4 +1229,5 @@ efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
efi_status_t efi_parse_options(char *cmdline); efi_status_t efi_parse_options(char *cmdline);
bool efi_runtime_disabled(void);
#endif /* _LINUX_EFI_H */ #endif /* _LINUX_EFI_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment