asm-generic: Always define Elf_Rel and Elf_Rela

These definitions are useful for relocating the kernel image as well,
regardless of the type of relocations used for modules.

Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Link: https://lore.kernel.org/r/20241026171441.3047904-5-samuel.holland@sifive.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/include/asm-generic/module.h b/include/asm-generic/module.h
index 98e1541b72b7019249fd73429ff811604075f18c..a8622501b9756760a09973fb106e1d21f0871b47 100644 (file)
--- a/include/asm-generic/module.h
+++ b/include/asm-generic/module.h
@@ -19,12 +19,8 @@ struct mod_arch_specific
 #define Elf_Dyn                Elf64_Dyn
 #define Elf_Ehdr       Elf64_Ehdr
 #define Elf_Addr       Elf64_Addr
-#ifdef CONFIG_MODULES_USE_ELF_REL
 #define Elf_Rel                Elf64_Rel
-#endif
-#ifdef CONFIG_MODULES_USE_ELF_RELA
 #define Elf_Rela       Elf64_Rela
-#endif
 #define ELF_R_TYPE(X)  ELF64_R_TYPE(X)
 #define ELF_R_SYM(X)   ELF64_R_SYM(X)
 
@@ -36,12 +32,8 @@ struct mod_arch_specific
 #define Elf_Dyn                Elf32_Dyn
 #define Elf_Ehdr       Elf32_Ehdr
 #define Elf_Addr       Elf32_Addr
-#ifdef CONFIG_MODULES_USE_ELF_REL
 #define Elf_Rel                Elf32_Rel
-#endif
-#ifdef CONFIG_MODULES_USE_ELF_RELA
 #define Elf_Rela       Elf32_Rela
-#endif
 #define ELF_R_TYPE(X)  ELF32_R_TYPE(X)
 #define ELF_R_SYM(X)   ELF32_R_SYM(X)
 #endif