efi: Allow the number of EFI configuration tables entries to be zero
Only try and access the EFI configuration tables if there there are any reported. This allows EFI to be continued to used on systems where there are no configuration table entries. Signed-off-by: Rob Bradford <robert.bradford@intel.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Gen Zhang <blackgod016574@gmail.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20190525112559.7917-3-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
4e78921ba4
commit
88447c5b93
|
@ -513,6 +513,9 @@ int __init efi_reuse_config(u64 tables, int nr_tables)
|
|||
void *p, *tablep;
|
||||
struct efi_setup_data *data;
|
||||
|
||||
if (nr_tables == 0)
|
||||
return 0;
|
||||
|
||||
if (!efi_setup)
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -636,6 +636,9 @@ int __init efi_config_init(efi_config_table_type_t *arch_tables)
|
|||
void *config_tables;
|
||||
int sz, ret;
|
||||
|
||||
if (efi.systab->nr_tables == 0)
|
||||
return 0;
|
||||
|
||||
if (efi_enabled(EFI_64BIT))
|
||||
sz = sizeof(efi_config_table_64_t);
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue