summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/module.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-05-12 21:45:50 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2006-05-12 21:45:50 +0200
commit06a1be167ea77c436657587e26cd4d7d6401784c (patch)
tree1d9ed9094496a1e02bfe551631b03495db337a89 /arch/sparc64/kernel/module.c
parent[SPARC64]: Update defconfig. (diff)
downloadlinux-06a1be167ea77c436657587e26cd4d7d6401784c.tar.xz
linux-06a1be167ea77c436657587e26cd4d7d6401784c.zip
[SPARC]: Handle UNWIND_INFO properly.
For sparc32 we need R_SPARC_UA32 relocation support, for sparc64 we need the handle R_SPARC_DISP32 relocations. Based upon reports and initial patch by Martin Habets. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/module.c')
-rw-r--r--arch/sparc64/kernel/module.c5
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) |