From c71e21e834d7ee7ab5caf4b3226ff6103f2b8f7c Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Fri, 12 May 2006 12:45:50 -0700
Subject: [PATCH] --- yaml --- r: 26685 b: refs/heads/master c:
 06a1be167ea77c436657587e26cd4d7d6401784c h: refs/heads/master i:   26683:
 4fc4652fe1f4a4481f60db2e1b91c78780c8f7c7 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/sparc/kernel/module.c   | 1 +
 trunk/arch/sparc64/defconfig       | 3 ++-
 trunk/arch/sparc64/kernel/module.c | 5 +++++
 trunk/lib/Kconfig.debug            | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e1370d375000..fef17d7b2221 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f8aa2f66b7253d1a42ead0142c7a00d2df5ac89
+refs/heads/master: 06a1be167ea77c436657587e26cd4d7d6401784c
diff --git a/trunk/arch/sparc/kernel/module.c b/trunk/arch/sparc/kernel/module.c
index 787d5f1347ec..598682f31ebf 100644
--- a/trunk/arch/sparc/kernel/module.c
+++ b/trunk/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/trunk/arch/sparc64/defconfig b/trunk/arch/sparc64/defconfig
index 22ca69fc865c..f09a70b8aabd 100644
--- a/trunk/arch/sparc64/defconfig
+++ b/trunk/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/trunk/arch/sparc64/kernel/module.c b/trunk/arch/sparc64/kernel/module.c
index 6c83e372f75d..579871527699 100644
--- a/trunk/arch/sparc64/kernel/module.c
+++ b/trunk/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/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 6ecc180beb71..ccb0c1fdf1b5 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/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.