diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-03 10:26:16 +0200 |
|---|---|---|
| committer | Borislav Petkov (AMD) <bp@alien8.de> | 2023-08-03 16:37:18 +0200 |
| commit | 6d33531bc0234332572ae612232d947f353a4450 (patch) | |
| tree | df47f7111c084c77199057e6c041fdb0d8ba745e | |
| parent | 65412c8d72741cc6e6b082b478b8957d7e7c0480 (diff) | |
| download | linux-stable-6d33531bc0234332572ae612232d947f353a4450.tar.gz linux-stable-6d33531bc0234332572ae612232d947f353a4450.tar.bz2 linux-stable-6d33531bc0234332572ae612232d947f353a4450.zip | |
x86/purgatory: Include header for warn() declaration
The purgatory code 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 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>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230803082619.1369127-5-arnd@kernel.org
| -rw-r--r-- | arch/x86/boot/compressed/error.c | 2 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/error.h | 2 | ||||
| -rw-r--r-- | 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 5313c5cb2b80..19a8251de506 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 86fe33b93715..31f9e080d61a 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 7558139920f8..aea47e793963 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"); |