From a57d59fcc29cdf98298180afc91772b939440d2f Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Thu, 16 Feb 2006 02:18:49 -0800
Subject: [PATCH] --- yaml --- r: 21472 b: refs/heads/master c:
 8e42550c683b2ad4869fc4fa438204841fd9b7cc h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sparc64/kernel/entry.S | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0738d7911141..a5028236234c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b6b46470cc1c52f6917b0cd8b7cf4b5cbc5acf6
+refs/heads/master: 8e42550c683b2ad4869fc4fa438204841fd9b7cc
diff --git a/trunk/arch/sparc64/kernel/entry.S b/trunk/arch/sparc64/kernel/entry.S
index a2842a72f8e6..bf40b065bcc0 100644
--- a/trunk/arch/sparc64/kernel/entry.S
+++ b/trunk/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