]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[MIPS] Make prepare_frametrace() not clobber v0
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Tue, 29 Aug 2006 03:10:22 +0000 (12:10 +0900)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 27 Sep 2006 12:37:37 +0000 (13:37 +0100)
Since lmo commit 323a380bf9e1a1679a774a2b053e3c1f2aa3f179 ("Simplify
dump_stack()") made prepare_frametrace() always inlined, using $2 (v0)
in __asm__ is not safe anymore.  We can use $1 (at) instead.  Also we
should use "dla" instead of "la" for 64-bit kernel.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/traps.c

index ab77034921c4ef05618892d423b85f61871441d6..e51d8fd9a15234ec4d3e5fabcafb22b24010f6ed 100644 (file)
@@ -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");