Skip to content

Commit 7699f7a

Browse files
Uwe Kleine-Königpalmer-dabbelt
authored andcommitted
RISC-V: Prepare dropping week attribute from arch_kexec_apply_relocations[_add]
Without this change arch/riscv/kernel/elf_kexec.c fails to compile once commit 233c1e6 ("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 233c1e6. This is safe to do on top of the riscv change even without the change to arch_kexec_apply_relocations. Fixes: 838b3e2 ("RISC-V: Load purgatory in kexec_file") Looks-good-to: liaochang (A) <[email protected]> Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 4e2bbec commit 7699f7a

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

arch/riscv/include/asm/kexec.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ extern riscv_kexec_method riscv_kexec_norelocate;
5555

5656
#ifdef CONFIG_KEXEC_FILE
5757
extern const struct kexec_file_ops elf_kexec_ops;
58+
59+
struct purgatory_info;
60+
int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
61+
Elf_Shdr *section,
62+
const Elf_Shdr *relsec,
63+
const Elf_Shdr *symtab);
64+
#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add
5865
#endif
5966

6067
#endif

0 commit comments

Comments
 (0)