mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Benjamin Thiel <b.thiel@posteo.de>
To: linux-efi@vger.kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>,
	Borislav Petkov <bp@alien8.de>,
	Benjamin Thiel <b.thiel@posteo.de>
Subject: [PATCH] efi: Pull up arch-specific prototype efi_systab_show_arch()
Date: Sat, 16 May 2020 14:59:48 +0200	[thread overview]
Message-ID: <20200516125948.3459-1-b.thiel@posteo.de> (raw)

... 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 | 7 ++-----
 include/linux/efi.h        | 4 ++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 911a2bd0f6b7..d3e7ce6f1027 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;
 }
@@ -1012,4 +1009,4 @@ static int __init register_update_efi_random_seed(void)
 	return register_reboot_notifier(&efi_random_seed_nb);
 }
 late_initcall(register_update_efi_random_seed);
-#endif
+#endifefi_systab_show_arch
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 251f1f783cdf..e47dae8c8d5f 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1245,4 +1245,8 @@ struct linux_efi_memreserve {
 
 void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size);
 
+#if defined(CONFIG_IA64) || defined(CONFIG_X86)
+extern char *efi_systab_show_arch(char *str);
+#endif
+
 #endif /* _LINUX_EFI_H */
-- 
2.20.1


             reply	other threads:[~2020-05-16 12:59 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-16 12:59 Benjamin Thiel [this message]
2020-05-16 13:01 ` Ard Biesheuvel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200516125948.3459-1-b.thiel@posteo.de \
    --to=b.thiel@posteo.de \
    --cc=bp@alien8.de \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®