Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80f0aad7 authored by Dave Martin's avatar Dave Martin Committed by Russell King
Browse files

ARM: 6766/1: Thumb-2: Reflect ARM/Thumb-2 configuration in module vermagic 



Loading Thumb-2 modules into an ARM kernel or vice-versa isn't
guaranteed to work safely, since the kernel is not interworking-
aware everywhere.

This patch adds "thumb2" to the module vermagic when
CONFIG_THUMB2_KERNEL is enabled, to help avoid accidental loading
of modules into the wrong kernel.

Signed-off-by: default avatarDave Martin <dave.martin@linaro.org>
Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3572bea8

arch/arm/include/asm/module.h

+8 −0
Original line number Diff line number Diff line
@@ -40,8 +40,16 @@ struct mod_arch_specific { 
#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 */