diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-05-12 12:45:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-05-12 12:45:50 -0700 |
| commit | 06a1be167ea77c436657587e26cd4d7d6401784c (patch) | |
| tree | 1d9ed9094496a1e02bfe551631b03495db337a89 | |
| parent | 1f8aa2f66b7253d1a42ead0142c7a00d2df5ac89 (diff) | |
| download | op-kernel-dev-06a1be167ea77c436657587e26cd4d7d6401784c.zip op-kernel-dev-06a1be167ea77c436657587e26cd4d7d6401784c.tar.gz | |
[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>
| -rw-r--r-- | arch/sparc/kernel/module.c | 1 | ||||
| -rw-r--r-- | arch/sparc64/defconfig | 3 | ||||
| -rw-r--r-- | arch/sparc64/kernel/module.c | 5 | ||||
| -rw-r--r-- | lib/Kconfig.debug | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/arch/sparc/kernel/module.c b/arch/sparc/kernel/module.c index 787d5f1..598682f 100644 --- a/arch/sparc/kernel/module.c +++ b/arch/sparc/kernel/module.c @@ -113,6 +113,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, switch (ELF32_R_TYPE(rel[i].r_info)) { case R_SPARC_32: + case R_SPARC_UA32: location[0] = v >> 24; location[1] = v >> 16; location[2] = v >> 8; diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 22ca69f..f09a70b 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17-rc3 -# Mon May 8 15:12:53 2006 +# Fri May 12 12:43:49 2006 # CONFIG_SPARC=y CONFIG_SPARC64=y @@ -1309,6 +1309,7 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set CONFIG_DEBUG_FS=y # CONFIG_DEBUG_VM is not set +# CONFIG_UNWIND_INFO is not set CONFIG_FORCED_INLINING=y # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_DEBUG_STACK_USAGE is not set diff --git a/arch/sparc64/kernel/module.c b/arch/sparc64/kernel/module.c index 6c83e37..5798715 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) | diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 6ecc180..ccb0c1f 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -189,7 +189,7 @@ config FRAME_POINTER config UNWIND_INFO bool "Compile the kernel with frame unwind information" depends on !IA64 - depends on !MODULES || !(MIPS || PARISC || PPC || SUPERH || SPARC64 || V850) + depends on !MODULES || !(MIPS || PARISC || PPC || SUPERH || V850) help If you say Y here the resulting kernel image will be slightly larger but not slower, and it will give very useful debugging information. |
