]> git.baikalelectronics.ru Git - kernel.git/commitdiff
RISC-V: Prepare dropping week attribute from arch_kexec_apply_relocations[_add]
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Mon, 30 May 2022 07:42:02 +0000 (09:42 +0200)
committerPalmer Dabbelt <palmer@rivosinc.com>
Mon, 30 May 2022 23:04:37 +0000 (16:04 -0700)
Without this change arch/riscv/kernel/elf_kexec.c fails to compile once
commit 233c1e6c319c ("kexec_file: drop weak attribute from
arch_kexec_apply_relocations[_add]") is also contained in the tree.
This currently happens in next-20220527.

Prepare the RISC-V similar to the s390 adaption done in 233c1e6c319c.
This is safe to do on top of the riscv change even without the change to
arch_kexec_apply_relocations.

Fixes: 7d80b55bbe8f ("RISC-V: Load purgatory in kexec_file")
Looks-good-to: liaochang (A) <liaochang1@huawei.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
arch/riscv/include/asm/kexec.h

index 206217b23301f02eb6d51540505a83a79060a174..eee260e8ab308e8a033995082e1119df4739eeb3 100644 (file)
@@ -55,6 +55,13 @@ extern riscv_kexec_method riscv_kexec_norelocate;
 
 #ifdef CONFIG_KEXEC_FILE
 extern const struct kexec_file_ops elf_kexec_ops;
+
+struct purgatory_info;
+int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
+                                    Elf_Shdr *section,
+                                    const Elf_Shdr *relsec,
+                                    const Elf_Shdr *symtab);
+#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add
 #endif
 
 #endif