commit c2e2611425a956d25d2948c5d95d3848c4db1257
author Daniel Jacobowitz <drow@false.org> Wed Dec 14 22:04:22 2005 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed Dec 14 22:04:22 2005 +0000
tree 54f6e333ff805a0a0eb63299f0adaa4d11544ab5
parent 1ee9530a71686436dbeb5f31dd5b925c39cf71d7

[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: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/kernel/module.c

diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index 6055e14..055bf5d 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -101,6 +101,8 @@
 			break;
 
 		case R_ARM_PC24:
+		case R_ARM_CALL:
+		case R_ARM_JUMP24:
 			offset = (*(u32 *)loc & 0x00ffffff) << 2;
 			if (offset & 0x02000000)
 				offset -= 0x04000000;