Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70583161 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] i386: Fix up backtrace fallback patch 



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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 65f87d8a

arch/i386/kernel/traps.c

+6 −4
Original line number Diff line number Diff line
@@ -190,11 +190,11 @@ static void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, 
		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 *s) 
		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);