aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2014-10-17 12:44:11 +0200
committerKees Cook <keescook@google.com>2015-10-07 13:12:43 -0700
commit5bcf1066810c5b7c16522446c827de7f42add9cf (patch)
tree5019fe07134e74aa0544f27a09dd356da0c7acc9
parent1d6cd6ce0ed58595dabdfb310e53353d9fad0947 (diff)
downloadlinux-linaro-stable-5bcf1066810c5b7c16522446c827de7f42add9cf.tar.gz
UPSTREAM: arm64/efi: drop redundant set_bit(EFI_CONFIG_TABLES)
The EFI_CONFIG_TABLES bit already gets set by efi_config_init(), so there is no reason to set it again after this function returns successfully. Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> (cherry picked from commit 4e27d4754e8990da264c1e01e2f6bd8340e30cb3) Signed-off-by: Tomasz Figa <tfiga@chromium.org> Bug: 24475017 Change-Id: I13a64ac2630ec1db22d4d4de4ebe9597cb83e291 Signed-off-by: Kees Cook <keescook@google.com>
-rw-r--r--arch/arm64/kernel/efi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
index 2e829148fb36..558572ef1ea3 100644
--- a/arch/arm64/kernel/efi.c
+++ b/arch/arm64/kernel/efi.c
@@ -112,8 +112,6 @@ static int __init uefi_init(void)
efi.systab->hdr.revision & 0xffff, vendor);
retval = efi_config_init(NULL);
- if (retval == 0)
- set_bit(EFI_CONFIG_TABLES, &efi.flags);
out:
early_memunmap(efi.systab, sizeof(efi_system_table_t));