diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-12 15:26:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-12 15:26:29 -0700 |
| commit | faa88df860fdfad13afc99fc7201432f9263b3b5 (patch) | |
| tree | 0c5b480922c4a2d65154f610ae04928790de96da /arch/sparc64/kernel/module.c | |
| parent | 1b52fa98edd1c3e663ea4a06519e3d20976084a8 (diff) | |
| parent | 586152560ae8df2a9babf1a8b667d7a145cb8208 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Fix warning on prom_getproperty in openprom.c
[SPARC]: Handle UNWIND_INFO properly.
[SPARC64]: Update defconfig.
[SPARC]: show device name in /proc/dvma_map
[SPARC]: Remove duplicate symbol exports
Diffstat (limited to 'arch/sparc64/kernel/module.c')
| -rw-r--r-- | arch/sparc64/kernel/module.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/module.c b/arch/sparc64/kernel/module.c index 6c83e372f75d..579871527699 100644 --- a/arch/sparc64/kernel/module.c +++ b/arch/sparc64/kernel/module.c @@ -143,6 +143,11 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, location[3] = v >> 0; break; + case R_SPARC_DISP32: + v -= (Elf64_Addr) location; + *loc32 = v; + break; + case R_SPARC_WDISP30: v -= (Elf64_Addr) location; *loc32 = (*loc32 & ~0x3fffffff) | |