 786d35d45c
			
		
	
	
	786d35d45c
	
	
	
		
			
			Use the mapping of Elf_[SPE]hdr, Elf_Addr, Elf_Sym, Elf_Dyn, Elf_Rel/Rela,
ELF_R_TYPE() and ELF_R_SYM() to either the 32-bit version or the 64-bit version
into asm-generic/module.h for all arches bar MIPS.
Also, use the generic definition mod_arch_specific where possible.
To this end, I've defined three new config bools:
 (*) HAVE_MOD_ARCH_SPECIFIC
     Arches define this if they don't want to use the empty generic
     mod_arch_specific struct.
 (*) MODULES_USE_ELF_RELA
     Arches define this if their modules can contain RELA records.  This causes
     the Elf_Rela mapping to be emitted and allows apply_relocate_add() to be
     defined by the arch rather than have the core emit an error message.
 (*) MODULES_USE_ELF_REL
     Arches define this if their modules can contain REL records.  This causes
     the Elf_Rel mapping to be emitted and allows apply_relocate() to be
     defined by the arch rather than have the core emit an error message.
Note that it is possible to allow both REL and RELA records: m68k and mips are
two arches that do this.
With this, some arch asm/module.h files can be deleted entirely and replaced
with a generic-y marker in the arch Kbuild file.
Additionally, I have removed the bits from m32r and score that handle the
unsupported type of relocation record as that's now handled centrally.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
		
	
			
		
			
				
	
	
		
			47 lines
		
	
	
	
		
			1,004 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			47 lines
		
	
	
	
		
			1,004 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef _ASM_ARM_MODULE_H
 | |
| #define _ASM_ARM_MODULE_H
 | |
| 
 | |
| #include <asm-generic/module.h>
 | |
| 
 | |
| struct unwind_table;
 | |
| 
 | |
| #ifdef CONFIG_ARM_UNWIND
 | |
| enum {
 | |
| 	ARM_SEC_INIT,
 | |
| 	ARM_SEC_DEVINIT,
 | |
| 	ARM_SEC_CORE,
 | |
| 	ARM_SEC_EXIT,
 | |
| 	ARM_SEC_DEVEXIT,
 | |
| 	ARM_SEC_MAX,
 | |
| };
 | |
| 
 | |
| struct mod_arch_specific {
 | |
| 	struct unwind_table *unwind[ARM_SEC_MAX];
 | |
| };
 | |
| #endif
 | |
| 
 | |
| /*
 | |
|  * Add the ARM architecture version to the version magic string
 | |
|  */
 | |
| #define MODULE_ARCH_VERMAGIC_ARMVSN "ARMv" __stringify(__LINUX_ARM_ARCH__) " "
 | |
| 
 | |
| /* Add __virt_to_phys patching state as well */
 | |
| #ifdef CONFIG_ARM_PATCH_PHYS_VIRT
 | |
| #define MODULE_ARCH_VERMAGIC_P2V "p2v8 "
 | |
| #else
 | |
| #define MODULE_ARCH_VERMAGIC_P2V ""
 | |
| #endif
 | |
| 
 | |
| /* Add instruction set architecture tag to distinguish ARM/Thumb kernels */
 | |
| #ifdef CONFIG_THUMB2_KERNEL
 | |
| #define MODULE_ARCH_VERMAGIC_ARMTHUMB "thumb2 "
 | |
| #else
 | |
| #define MODULE_ARCH_VERMAGIC_ARMTHUMB ""
 | |
| #endif
 | |
| 
 | |
| #define MODULE_ARCH_VERMAGIC \
 | |
| 	MODULE_ARCH_VERMAGIC_ARMVSN \
 | |
| 	MODULE_ARCH_VERMAGIC_ARMTHUMB \
 | |
| 	MODULE_ARCH_VERMAGIC_P2V
 | |
| 
 | |
| #endif /* _ASM_ARM_MODULE_H */
 |