From: David S. Miller <davem@sunset.davemloft.net>
Date: Thu, 16 Feb 2006 10:18:49 +0000 (-0800)
Subject: [SPARC64]: do_fptrap needs to load the thread reg into %g6.
X-Git-Tag: v2.6.17-rc1~1184^2~93
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8e42550c683b2ad4869fc4fa438204841fd9b7cc;p=linux-2.6-omap-h63xx.git

[SPARC64]: do_fptrap needs to load the thread reg into %g6.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index a2842a72f8e..bf40b065bcc 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -356,6 +356,7 @@ fitos_emul_fini:
 	.globl		do_fptrap
 	.align		32
 do_fptrap:
+	TRAP_LOAD_THREAD_REG(%g6, %g1)
 	stx		%fsr, [%g6 + TI_XFSR]
 do_fptrap_after_fsr:
 	ldub		[%g6 + TI_FPSAVED], %g3