diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
| commit | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (patch) | |
| tree | b5493c816a1f76a01319a84955c5ba07d47517c3 /arch/arm/kernel/module.c | |
| parent | e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5 (diff) | |
| parent | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/arm/kernel/module.c')
| -rw-r--r-- | arch/arm/kernel/module.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 6055e1427ba..055bf5d2889 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c | |||
| @@ -101,6 +101,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, | |||
| 101 | break; | 101 | break; |
| 102 | 102 | ||
| 103 | case R_ARM_PC24: | 103 | case R_ARM_PC24: |
| 104 | case R_ARM_CALL: | ||
| 105 | case R_ARM_JUMP24: | ||
| 104 | offset = (*(u32 *)loc & 0x00ffffff) << 2; | 106 | offset = (*(u32 *)loc & 0x00ffffff) << 2; |
| 105 | if (offset & 0x02000000) | 107 | if (offset & 0x02000000) |
| 106 | offset -= 0x04000000; | 108 | offset -= 0x04000000; |