[PATCH 5/7] Miscellaneous cleanup in prologue analysis code

[Franck Bui-Huu <vagabon.xyz@gmail.com>]

We usually use backtrace term for dumping a call tree during
debug. Therefore this patch renames show_frametrace() into
show_backtrace().

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
---
 arch/mips/kernel/traps.c |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 4a11a3d..15fa445 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -74,19 +74,18 @@ void (*board_ejtag_handler_setup)(void);
 void (*board_bind_eic_interrupt)(int irq, int regset);
 
 
-static void show_trace(unsigned long *stack)
+static void show_trace(unsigned long *sp)
 {
-       const int field = 2 * sizeof(unsigned long);
        unsigned long addr;
 
        printk("Call Trace:");
 #ifdef CONFIG_KALLSYMS
        printk("\n");
 #endif
-       while (!kstack_end(stack)) {
-               addr = *stack++;
+       while (!kstack_end(sp)) {
+               addr = *sp++;
                if (__kernel_text_address(addr)) {
-                       printk(" [<%0*lx>] ", field, addr);
+                       printk(" [<%0*lx>] ", 2 * sizeof(unsigned long), addr);
                        print_symbol("%s\n", addr);
                }
        }
@@ -104,22 +103,21 @@ __setup("raw_show_trace", set_raw_show_t
 
 extern unsigned long unwind_stack(struct task_struct *task,
                                  unsigned long **sp, unsigned long pc);
-static void show_frametrace(struct task_struct *task, struct pt_regs *regs)
+static void show_backtrace(struct task_struct *task, struct pt_regs *regs)
 {
-       const int field = 2 * sizeof(unsigned long);
-       unsigned long *stack = (long *)regs->regs[29];
+       unsigned long *sp = (long *)regs->regs[29];
        unsigned long pc = regs->cp0_epc;
        int top = 1;
 
        if (raw_show_trace || !__kernel_text_address(pc)) {
-               show_trace(stack);
+               show_trace(sp);
                return;
        }
        printk("Call Trace:\n");
        while (__kernel_text_address(pc)) {
-               printk(" [<%0*lx>] ", field, pc);
+               printk(" [<%0*lx>] ", 2 * sizeof(unsigned long), pc);
                print_symbol("%s\n", pc);
-               pc = unwind_stack(task, &stack, pc);
+               pc = unwind_stack(task, &sp, pc);
                if (top && pc == 0)
                        pc = regs->regs[31];    /* leaf? */
                top = 0;
@@ -127,7 +125,7 @@ static void show_frametrace(struct task_
        printk("\n");
 }
 #else
-#define show_frametrace(task, r) show_trace((long *)(r)->regs[29]);
+#define show_backtrace(task, r) show_trace((long *)(r)->regs[29]);
 #endif
 
 /*
@@ -160,7 +158,7 @@ static void show_stacktrace(struct task_
                i++;
        }
        printk("\n");
-       show_frametrace(task, regs);
+       show_backtrace(task, regs);
 }
 
 static noinline void prepare_frametrace(struct pt_regs *regs)
@@ -211,7 +209,7 @@ #ifdef CONFIG_KALLSYMS
        if (!raw_show_trace) {
                struct pt_regs regs;
                prepare_frametrace(&regs);
-               show_frametrace(current, &regs);
+               show_backtrace(current, &regs);
                return;
        }
 #endif
-- 
1.4.2.rc2