]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
efi: Pull up arch-specific prototype efi_systab_show_arch()
authorBenjamin Thiel <b.thiel@posteo.de>
Sat, 16 May 2020 13:26:47 +0000 (15:26 +0200)
committerArd Biesheuvel <ardb@kernel.org>
Sun, 17 May 2020 09:46:50 +0000 (11:46 +0200)
Pull up arch-specific prototype efi_systab_show_arch() in order to
fix a -Wmissing-prototypes warning:

arch/x86/platform/efi/efi.c:957:7: warning: no previous prototype for
‘efi_systab_show_arch’ [-Wmissing-prototypes]
char *efi_systab_show_arch(char *str)

Signed-off-by: Benjamin Thiel <b.thiel@posteo.de>
Link: https://lore.kernel.org/r/20200516132647.14568-1-b.thiel@posteo.de
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
drivers/firmware/efi/efi.c
include/linux/efi.h

index 911a2bd0f6b7046096d204fb8b790c76480cd267..4e3055238f31922d7a59aa0cc2eaa47d3b2b4907 100644 (file)
@@ -130,11 +130,8 @@ static ssize_t systab_show(struct kobject *kobj,
        if (efi.smbios != EFI_INVALID_TABLE_ADDR)
                str += sprintf(str, "SMBIOS=0x%lx\n", efi.smbios);
 
-       if (IS_ENABLED(CONFIG_IA64) || IS_ENABLED(CONFIG_X86)) {
-               extern char *efi_systab_show_arch(char *str);
-
+       if (IS_ENABLED(CONFIG_IA64) || IS_ENABLED(CONFIG_X86))
                str = efi_systab_show_arch(str);
-       }
 
        return str - buf;
 }
index 251f1f783cdf70af1977b48a512f492daf0935e9..9430d01c0c3d339f9402935d0d164223070c2602 100644 (file)
@@ -1245,4 +1245,6 @@ struct linux_efi_memreserve {
 
 void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size);
 
+char *efi_systab_show_arch(char *str);
+
 #endif /* _LINUX_EFI_H */