From: Arnd Bergmann <arnd@kernel.org>
To: linux-kernel@vger.kernel.org, x86@kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH 4/5] [RESEND] x86: purgatory: include header for warn() declaration
Date: Tue, 25 Jul 2023 15:48:36 +0200 [thread overview]
Message-ID: <20230725134837.1534228-5-arnd@kernel.org> (raw)
In-Reply-To: <20230725134837.1534228-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb.de>
The purgatory code has uses parts of the decompressor and provides
its own warn() function, but has to include the corresponding
header file to avoid a -Wmissing-prototypes warning.
It turns out that this the function prototype actually differs
from the declaration, so change it to get a constant pointer
in the declaration and the other definition as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/x86/boot/compressed/error.c | 2 +-
arch/x86/boot/compressed/error.h | 2 +-
arch/x86/purgatory/purgatory.c | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/x86/boot/compressed/error.c b/arch/x86/boot/compressed/error.c
index 5313c5cb2b802..19a8251de506a 100644
--- a/arch/x86/boot/compressed/error.c
+++ b/arch/x86/boot/compressed/error.c
@@ -7,7 +7,7 @@
#include "misc.h"
#include "error.h"
-void warn(char *m)
+void warn(const char *m)
{
error_putstr("\n\n");
error_putstr(m);
diff --git a/arch/x86/boot/compressed/error.h b/arch/x86/boot/compressed/error.h
index 86fe33b937154..31f9e080d61a8 100644
--- a/arch/x86/boot/compressed/error.h
+++ b/arch/x86/boot/compressed/error.h
@@ -4,7 +4,7 @@
#include <linux/compiler.h>
-void warn(char *m);
+void warn(const char *m);
void error(char *m) __noreturn;
void panic(const char *fmt, ...) __noreturn __cold;
diff --git a/arch/x86/purgatory/purgatory.c b/arch/x86/purgatory/purgatory.c
index 7558139920f8c..aea47e7939637 100644
--- a/arch/x86/purgatory/purgatory.c
+++ b/arch/x86/purgatory/purgatory.c
@@ -14,6 +14,7 @@
#include <crypto/sha2.h>
#include <asm/purgatory.h>
+#include "../boot/compressed/error.h"
#include "../boot/string.h"
u8 purgatory_sha256_digest[SHA256_DIGEST_SIZE] __section(".kexec-purgatory");
--
2.39.2
next prev parent reply other threads:[~2023-07-25 13:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-25 13:48 [PATCH 0/5] remaining x86 -Wmissing-prototype warnings Arnd Bergmann
2023-07-25 13:48 ` [PATCH 1/5] [RESEND] x86: apic: hide unused safe_smp_processor_id on UP Arnd Bergmann
2023-08-03 15:59 ` [tip: x86/cleanups] x86/apic: Hide unused safe_smp_processor_id() on 32-bit UP tip-bot2 for Arnd Bergmann
2023-07-25 13:48 ` [PATCH 2/5] [RESEND] x86: avoid unneeded __div64_32 function definition Arnd Bergmann
2023-08-01 17:03 ` Borislav Petkov
2023-08-01 20:48 ` Arnd Bergmann
2023-08-02 17:20 ` Borislav Petkov
2023-08-07 20:37 ` Maciej W. Rozycki
2023-08-07 21:16 ` Borislav Petkov
2023-08-07 21:58 ` Maciej W. Rozycki
2023-07-25 13:48 ` [PATCH 3/5] [RESEND] x86: qspinlock-paravirt: fix mising-prototype warnings Arnd Bergmann
2023-08-01 19:22 ` Borislav Petkov
2023-08-01 20:26 ` Arnd Bergmann
2023-08-02 17:26 ` Borislav Petkov
2023-08-02 17:27 ` Borislav Petkov
2023-07-25 13:48 ` Arnd Bergmann [this message]
2023-07-25 13:48 ` [PATCH 5/5] [RESEND] x86: alternative: add __alt_reloc_selftest prototype Arnd Bergmann
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=20230725134837.1534228-5-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@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
Powered by JetHome