[PATCH for 2.6.18] [7/8] i386: Fix up backtrace fallback patch

From: Andi Kleen
Date: Sat Jul 29 2006 - 15:41:12 EST



I didn't test all compilation combinations. Shame on me.
And fix a missing option in the boot option following x86-64 (Jan Beulich)

Signed-off-by: Andi Kleen <ak@xxxxxxx>

---
arch/i386/kernel/traps.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)

Index: linux-2.6.18-rc2-git7/arch/i386/kernel/traps.c
===================================================================
--- linux-2.6.18-rc2-git7.orig/arch/i386/kernel/traps.c
+++ linux-2.6.18-rc2-git7/arch/i386/kernel/traps.c
@@ -190,11 +190,11 @@ static void show_trace_log_lvl(struct ta
if (unw_ret > 0 && !arch_unw_user_mode(&info)) {
#ifdef CONFIG_STACK_UNWIND
print_symbol("DWARF2 unwinder stuck at %s\n",
- UNW_PC(info.regs));
+ UNW_PC(&info));
if (call_trace == 1) {
printk("Leftover inexact backtrace:\n");
- if (UNW_SP(info.regs))
- stack = (void *)UNW_SP(info.regs);
+ if (UNW_SP(&info))
+ stack = (void *)UNW_SP(&info);
} else if (call_trace > 1)
return;
else
@@ -1249,8 +1249,10 @@ static int __init call_trace_setup(char
call_trace = -1;
else if (strcmp(s, "both") == 0)
call_trace = 0;
- else if (strcmp(s, "new") == 0)
+ else if (strcmp(s, "newfallback") == 0)
call_trace = 1;
+ else if (strcmp(s, "new") == 2)
+ call_trace = 2;
return 1;
}
__setup("call_trace=", call_trace_setup);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/