diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-12-14 19:21:48 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-12-14 19:21:48 -0500 |
| commit | 28247644cc07b54a798d997631d01531f2d9acfd (patch) | |
| tree | a4cffdcacd92504b23045cdea60f8c4aa45dd466 /arch/arm/kernel/module.c | |
| parent | 1542272a60ab9c0655a13ead8b7d7a661365f9fb (diff) | |
| parent | c7868048a7314bb4a2973097d605f00acd3b70bd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 6055e1427ba3..055bf5d28894 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; |