summaryrefslogtreecommitdiffstats
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorRob Bradford2019-05-25 13:25:59 +0200
committerIngo Molnar2019-05-25 13:48:17 +0200
commit88447c5b93d98be847f428c39ba589779a59eb83 (patch)
treecee45ba436e2cd3dda721a76d23a2e8c8ef4ecf7 /arch/x86/platform
parentefi/x86/Add missing error handling to old_memmap 1:1 mapping code (diff)
downloadkernel-qcow2-linux-88447c5b93d98be847f428c39ba589779a59eb83.tar.gz
kernel-qcow2-linux-88447c5b93d98be847f428c39ba589779a59eb83.tar.xz
kernel-qcow2-linux-88447c5b93d98be847f428c39ba589779a59eb83.zip
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>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r--arch/x86/platform/efi/quirks.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c
index feb77777c8b8..632b83885867 100644
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -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;