Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / arch / mips / kernel / traps.c

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 440b8651fd8b0fbc4266ca32ad5b0df185254753..b7292a56d4cd80b65d4bf2ef6f6ff016d371c857 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -115,8 +115,7 @@ static void show_backtrace(struct task_struct *task, struct pt_regs *regs)
        printk("Call Trace:\n");
        do {
                print_ip_sym(pc);
-               pc = unwind_stack(task, &sp, pc, ra);
-               ra = 0;
+               pc = unwind_stack(task, &sp, pc, &ra);
        } while (pc);
        printk("\n");
 }