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

Commit c2e26114 authored by Daniel Jacobowitz's avatar Daniel Jacobowitz Committed by Russell King
Browse files

[ARM] 3205/1: Handle new EABI relocations when loading kernel modules. 



Patch from Daniel Jacobowitz

Handle new EABI relocations when loading kernel modules.  This is
necessary for CONFIG_AEABI kernels, and also for some broken
(since fixed) old ABI toolchains.

Signed-off-by: default avatarDaniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1ee9530a

arch/arm/kernel/module.c

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, 
			break;



		case R_ARM_PC24:

		case R_ARM_CALL:

		case R_ARM_JUMP24:

			offset = (*(u32 *)loc & 0x00ffffff) << 2;

			if (offset & 0x02000000)

				offset -= 0x04000000;

include/asm-arm/elf.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ typedef unsigned long elf_freg_t[3]; 
#define R_ARM_NONE	0

#define R_ARM_PC24	1

#define R_ARM_ABS32	2

#define R_ARM_CALL	28

#define R_ARM_JUMP24	29



#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))

typedef elf_greg_t elf_gregset_t[ELF_NGREG];