aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2016-04-25 16:06:33 -0400
committerIngo Molnar <mingo@kernel.org>2016-04-28 05:33:46 -0400
commitc5b591e96db9d99d0126acf93f24e1fb8b368343 (patch)
tree13705099a41ae528b9687e774ec0040d507e76c2
parentede85e90be26e5de2a72f76feec01cfc5281d4bd (diff)
efi: Get rid of the EFI_SYSTEM_TABLES status bit
The EFI_SYSTEM_TABLES status bit is set by all EFI supporting architectures upon discovery of the EFI system table, but the bit is never tested in any code we have in the tree. So remove it. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk> Cc: Borislav Petkov <bp@alien8.de> Cc: Leif Lindholm <leif.lindholm@linaro.org> Cc: Luck, Tony <tony.luck@intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1461614832-17633-2-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/ia64/kernel/efi.c2
-rw-r--r--arch/x86/platform/efi/efi.c2
-rw-r--r--drivers/firmware/efi/arm-runtime.c1
-rw-r--r--include/linux/efi.h1
4 files changed, 0 insertions, 6 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 300dac3702f1..bf0865cd438a 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -531,8 +531,6 @@ efi_init (void)
531 efi.systab->hdr.revision >> 16, 531 efi.systab->hdr.revision >> 16,
532 efi.systab->hdr.revision & 0xffff, vendor); 532 efi.systab->hdr.revision & 0xffff, vendor);
533 533
534 set_bit(EFI_SYSTEM_TABLES, &efi.flags);
535
536 palo_phys = EFI_INVALID_TABLE_ADDR; 534 palo_phys = EFI_INVALID_TABLE_ADDR;
537 535
538 if (efi_config_init(arch_tables) != 0) 536 if (efi_config_init(arch_tables) != 0)
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 994a7df84a7b..df393eab0e50 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -352,8 +352,6 @@ static int __init efi_systab_init(void *phys)
352 efi.systab->hdr.revision >> 16, 352 efi.systab->hdr.revision >> 16,
353 efi.systab->hdr.revision & 0xffff); 353 efi.systab->hdr.revision & 0xffff);
354 354
355 set_bit(EFI_SYSTEM_TABLES, &efi.flags);
356
357 return 0; 355 return 0;
358} 356}
359 357
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 6ae21e41a429..16c7d2a71156 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -105,7 +105,6 @@ static int __init arm_enable_runtime_services(void)
105 pr_err("Failed to remap EFI System Table\n"); 105 pr_err("Failed to remap EFI System Table\n");
106 return -ENOMEM; 106 return -ENOMEM;
107 } 107 }
108 set_bit(EFI_SYSTEM_TABLES, &efi.flags);
109 108
110 if (!efi_virtmap_init()) { 109 if (!efi_virtmap_init()) {
111 pr_err("No UEFI virtual mapping was installed -- runtime services will not be available\n"); 110 pr_err("No UEFI virtual mapping was installed -- runtime services will not be available\n");
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 1626474567ac..1545098b0565 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1000,7 +1000,6 @@ extern int __init efi_setup_pcdp_console(char *);
1000 * possible, remove EFI-related code altogether. 1000 * possible, remove EFI-related code altogether.
1001 */ 1001 */
1002#define EFI_BOOT 0 /* Were we booted from EFI? */ 1002#define EFI_BOOT 0 /* Were we booted from EFI? */
1003#define EFI_SYSTEM_TABLES 1 /* Can we use EFI system tables? */
1004#define EFI_CONFIG_TABLES 2 /* Can we use EFI config tables? */ 1003#define EFI_CONFIG_TABLES 2 /* Can we use EFI config tables? */
1005#define EFI_RUNTIME_SERVICES 3 /* Can we use runtime services? */ 1004#define EFI_RUNTIME_SERVICES 3 /* Can we use runtime services? */
1006#define EFI_MEMMAP 4 /* Can we use EFI memory map? */ 1005#define EFI_MEMMAP 4 /* Can we use EFI memory map? */