Skip to contentSkip to conversation

efi: Pull up arch-specific prototype efi_systab_show_arch()

PATCH Applied Benjamin Thiel 4 participants 4 messages May 16, 2020 – May 22, 2020 EFI

lore
Share & tools
lore

Benjamin Thiel

author
#0 lore raw

PATCH v2 1/1 efi: 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 <[email protected]>
---
 drivers/firmware/efi/efi.c | 5 +----
 include/linux/efi.h        | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/firmware/efi/efi.c +1 -4
index 911a2bd0f6b7..4e3055238f31 100644
@@ -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;
 }
include/linux/efi.h +2 -0
index 251f1f783cdf..9430d01c0c3d 100644
@@ -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 */
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 8 lines · Benjamin Thiel

... 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 <[email protected]>

Thanks, I'll queue this as a fix.

Nit: please don't treat the subject line as the first N words of the commit log, but start with a full sentence. Not all mail readers show the subject line and the body together. I've fixed it up for now.

Quoted 36 lines
---
 drivers/firmware/efi/efi.c | 5 +----
 include/linux/efi.h        | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/firmware/efi/efi.c +1 -4
index 911a2bd0f6b7..4e3055238f31 100644
@@ -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;
 }
include/linux/efi.h +2 -1
index 251f1f783cdf..9430d01c0c3d 100644
@@ -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 */
--

2.20.1

#2 lore raw
Quoted 8 lines · Ard Biesheuvel
Quoted 7 lines · Benjamin Thiel

... 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)

Quoted 7 lines
Quoted 1 line
Signed-off-by Benjamin Thiel <[email protected]>

Thanks, I'll queue this as a fix.

Nit: please don't treat the subject line as the first N words of the commit log, but start with a full sentence. Not all mail readers show the subject line and the body together. I've fixed it up for now.

That was my suggestion as I do that a lot. :)

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
merge bot Applied
#3 lore raw
In reply to Benjamin Thiel
The following commit has been merged into the efi/urgent branch of tip:

The following commit has been merged into the efi/urgent branch of tip:

Commit-ID:     e8da08a088236aff4b51d4ec97c750051f9fe417
Gitweb:        https://git.kernel.org/tip/e8da08a088236aff4b51d4ec97c750051f9fe417
Author:        Benjamin Thiel <[email protected]>
AuthorDate:    Sat, 16 May 2020 15:26:47 +02:00
Committer:     Ard Biesheuvel <[email protected]>
CommitterDate: Sun, 17 May 2020 11:46:50 +02:00

efi: Pull up arch-specific prototype efi_systab_show_arch()

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 <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Ard Biesheuvel <[email protected]>
---
 drivers/firmware/efi/efi.c | 5 +----
 include/linux/efi.h        | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/firmware/efi/efi.c +1 -4
index 911a2bd..4e30552 100644
@@ -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;
 }
include/linux/efi.h +2 -0
index 251f1f7..9430d01 100644
@@ -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 */