diff options
| author | Thorsten Blum <thorsten.blum@linux.dev> | 2026-06-06 20:17:52 -0600 |
|---|---|---|
| committer | Paul Walmsley <pjw@kernel.org> | 2026-06-06 20:17:52 -0600 |
| commit | a24c7f3523ff1112e8dc6c45cea7d9397345a627 (patch) | |
| tree | b280bf7e763c2178fedc898e3fb93094927821cf | |
| parent | 1e01a786a904274d308a99b00a0f20e0d288eeff (diff) | |
| download | linux-next-a24c7f3523ff1112e8dc6c45cea7d9397345a627.tar.gz linux-next-a24c7f3523ff1112e8dc6c45cea7d9397345a627.zip | |
riscv/purgatory: add asm/purgatory.h
Add arch/riscv/include/asm/purgatory.h and provide the purgatory()
prototype via the architecture header, mirroring the x86 layout.
Remove the workaround from arch/riscv/purgatory/purgatory.c.
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://patch.msgid.link/20260509073850.44595-4-thorsten.blum@linux.dev
[pjw@kernel.org: drop superfluous extern in header file]
Signed-off-by: Paul Walmsley <pjw@kernel.org>
| -rw-r--r-- | arch/riscv/include/asm/purgatory.h | 11 | ||||
| -rw-r--r-- | arch/riscv/purgatory/purgatory.c | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/arch/riscv/include/asm/purgatory.h b/arch/riscv/include/asm/purgatory.h new file mode 100644 index 000000000000..5a827e6752b7 --- /dev/null +++ b/arch/riscv/include/asm/purgatory.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_RISCV_PURGATORY_H +#define _ASM_RISCV_PURGATORY_H + +#ifndef __ASSEMBLER__ +#include <linux/purgatory.h> + +void purgatory(void); +#endif /* __ASSEMBLER__ */ + +#endif /* _ASM_RISCV_PURGATORY_H */ diff --git a/arch/riscv/purgatory/purgatory.c b/arch/riscv/purgatory/purgatory.c index 745deeb6e3a5..3474e3abe5d7 100644 --- a/arch/riscv/purgatory/purgatory.c +++ b/arch/riscv/purgatory/purgatory.c @@ -8,9 +8,9 @@ * */ -#include <linux/purgatory.h> #include <linux/kernel.h> #include <linux/string.h> +#include <asm/purgatory.h> #include <asm/string.h> u8 purgatory_sha256_digest[SHA256_DIGEST_SIZE] __section(".kexec-purgatory"); @@ -32,9 +32,6 @@ static bool verify_sha256_digest(void) return memcmp(digest, purgatory_sha256_digest, sizeof(digest)) == 0; } -/* workaround for a warning with -Wmissing-prototypes */ -void purgatory(void); - void purgatory(void) { if (!verify_sha256_digest()) |