* [PATCH v2] efi: Pull up arch-specific prototype efi_systab_show_arch()
@ 2020-05-16 13:26 Benjamin Thiel
2020-05-16 13:32 ` Ard Biesheuvel
2020-05-22 18:30 ` [tip: efi/urgent] " tip-bot2 for Benjamin Thiel
0 siblings, 2 replies; 4+ messages in thread
From: Benjamin Thiel @ 2020-05-16 13:26 UTC (permalink / raw)
To: linux-efi; +Cc: LKML, Borislav Petkov, 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 <b.thiel@posteo.de>
---
drivers/firmware/efi/efi.c | 5 +----
include/linux/efi.h | 2 ++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 911a2bd0f6b7..4e3055238f31 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -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;
}
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 251f1f783cdf..9430d01c0c3d 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] efi: Pull up arch-specific prototype efi_systab_show_arch()
2020-05-16 13:26 [PATCH v2] efi: Pull up arch-specific prototype efi_systab_show_arch() Benjamin Thiel
@ 2020-05-16 13:32 ` Ard Biesheuvel
2020-05-16 13:37 ` Borislav Petkov
2020-05-22 18:30 ` [tip: efi/urgent] " tip-bot2 for Benjamin Thiel
1 sibling, 1 reply; 4+ messages in thread
From: Ard Biesheuvel @ 2020-05-16 13:32 UTC (permalink / raw)
To: Benjamin Thiel; +Cc: linux-efi, LKML, Borislav Petkov
On Sat, 16 May 2020 at 15:26, Benjamin Thiel <b.thiel@posteo.de> wrote:
>
> ... 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>
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.
> ---
> drivers/firmware/efi/efi.c | 5 +----
> include/linux/efi.h | 2 ++
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
> index 911a2bd0f6b7..4e3055238f31 100644
> --- a/drivers/firmware/efi/efi.c
> +++ b/drivers/firmware/efi/efi.c
> @@ -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;
> }
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index 251f1f783cdf..9430d01c0c3d 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] efi: Pull up arch-specific prototype efi_systab_show_arch()
2020-05-16 13:32 ` Ard Biesheuvel
@ 2020-05-16 13:37 ` Borislav Petkov
0 siblings, 0 replies; 4+ messages in thread
From: Borislav Petkov @ 2020-05-16 13:37 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: Benjamin Thiel, linux-efi, LKML
On Sat, May 16, 2020 at 03:32:25PM +0200, Ard Biesheuvel wrote:
> On Sat, 16 May 2020 at 15:26, Benjamin Thiel <b.thiel@posteo.de> wrote:
> >
> > ... 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>
>
> 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. :)
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip: efi/urgent] efi: Pull up arch-specific prototype efi_systab_show_arch()
2020-05-16 13:26 [PATCH v2] efi: Pull up arch-specific prototype efi_systab_show_arch() Benjamin Thiel
2020-05-16 13:32 ` Ard Biesheuvel
@ 2020-05-22 18:30 ` tip-bot2 for Benjamin Thiel
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Benjamin Thiel @ 2020-05-22 18:30 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Benjamin Thiel, Ard Biesheuvel, x86, LKML
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 <b.thiel@posteo.de>
AuthorDate: Sat, 16 May 2020 15:26:47 +02:00
Committer: Ard Biesheuvel <ardb@kernel.org>
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 <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 | 5 +----
include/linux/efi.h | 2 ++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 911a2bd..4e30552 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -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;
}
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 251f1f7..9430d01 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -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 */
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-22 18:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-16 13:26 [PATCH v2] efi: Pull up arch-specific prototype efi_systab_show_arch() Benjamin Thiel
2020-05-16 13:32 ` Ard Biesheuvel
2020-05-16 13:37 ` Borislav Petkov
2020-05-22 18:30 ` [tip: efi/urgent] " tip-bot2 for Benjamin Thiel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.