public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@kernel.org>
To: Borislav Petkov <bp@alien8.de>
Cc: Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	linux-kernel@vger.kernel.org, x86@kernel.org,
	Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH v3 4/7] x86: purgatory: include header for warn() declaration
Date: Thu,  3 Aug 2023 10:26:16 +0200	[thread overview]
Message-ID: <20230803082619.1369127-5-arnd@kernel.org> (raw)
In-Reply-To: <20230803082619.1369127-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


  parent reply	other threads:[~2023-08-03  8:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-03  8:26 [PATCH v3 0/7] x86: remaining -Wmissing-prototype warning fixes Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 1/7] x86: Fix amd_check_microcode() declaration Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 2/7] x86: apic: hide unused safe_smp_processor_id on UP Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 3/7] x86: avoid unneeded __div64_32 function definition Arnd Bergmann
2023-08-03 15:59   ` [tip: x86/cleanups] x86/asm: Avoid " tip-bot2 for Arnd Bergmann
2023-08-03  8:26 ` Arnd Bergmann [this message]
2023-08-03 15:59   ` [tip: x86/cleanups] x86/purgatory: Include header for warn() declaration tip-bot2 for Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 5/7] x86: alternative: add __alt_reloc_selftest prototype Arnd Bergmann
2023-08-03 15:59   ` [tip: x86/cleanups] x86/alternative: Add a __alt_reloc_selftest() prototype tip-bot2 for Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 6/7] x86: paravirt: shut up unused native_pv_lock_init() function warning Arnd Bergmann
2023-08-03 15:59   ` [tip: x86/cleanups] x86/paravirt: Silence " tip-bot2 for Arnd Bergmann
2023-08-03  8:26 ` [PATCH v3 7/7] x86: qspinlock-paravirt: fix mising-prototype warning Arnd Bergmann
2023-08-03 15:59   ` [tip: x86/cleanups] x86/qspinlock-paravirt: Fix missing-prototype warning tip-bot2 for Arnd Bergmann
2023-08-03 10:04 ` [PATCH v3 0/7] x86: remaining -Wmissing-prototype warning fixes Borislav Petkov

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=20230803082619.1369127-5-arnd@kernel.org \
    --to=arnd@kernel.org \
    --cc=arnd@arndb.de \
    --cc=bp@alien8.de \
    --cc=dave.hansen@linux.intel.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