From cd0377f6ce4c393c90c5de6e43b61f56fc1fe1cc Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Tue, 29 Aug 2006 12:10:22 +0900
Subject: [PATCH] --- yaml --- r: 36016 b: refs/heads/master c:
 898d229107f7aa8ea45685c11e2930783755f9ba h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/arch/mips/kernel/traps.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3fcde85b316e..96cef155e0de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6502791d780b22fc147150137704a07a05ba361
+refs/heads/master: 898d229107f7aa8ea45685c11e2930783755f9ba
diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c
index ab77034921c4..e51d8fd9a152 100644
--- a/trunk/arch/mips/kernel/traps.c
+++ b/trunk/arch/mips/kernel/traps.c
@@ -161,16 +161,20 @@ static void show_stacktrace(struct task_struct *task, struct pt_regs *regs)
 static __always_inline void prepare_frametrace(struct pt_regs *regs)
 {
 	__asm__ __volatile__(
-		"1: la $2, 1b\n\t"
+		".set push\n\t"
+		".set noat\n\t"
 #ifdef CONFIG_64BIT
-		"sd $2, %0\n\t"
+		"1: dla $1, 1b\n\t"
+		"sd $1, %0\n\t"
 		"sd $29, %1\n\t"
 		"sd $31, %2\n\t"
 #else
-		"sw $2, %0\n\t"
+		"1: la $1, 1b\n\t"
+		"sw $1, %0\n\t"
 		"sw $29, %1\n\t"
 		"sw $31, %2\n\t"
 #endif
+		".set pop\n\t"
 		: "=m" (regs->cp0_epc),
 		"=m" (regs->regs[29]), "=m" (regs->regs[31])
 		: : "memory");