Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42995
b: refs/heads/master
c: dd315df
h: refs/heads/master
i:
  42993: c9bbcb1
  42991: 1d7a819
v: v3
  • Loading branch information
Andi Kleen authored and Andi Kleen committed Dec 7, 2006
1 parent cc3680e commit f5d1dad
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b615ebdac97c648a2ae7d23c5a0bbb3972adf928
refs/heads/master: dd315df1767cf56bd4fb8d730fdff4a3d7e15d84
10 changes: 5 additions & 5 deletions trunk/arch/i386/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -202,22 +202,22 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
if (unw_ret > 0) {
if (call_trace == 1 && !arch_unw_user_mode(&info)) {
ops->warning_symbol(data,
"DWARF2 unwinder stuck at %s\n",
"DWARF2 unwinder stuck at %s",
UNW_PC(&info));
if (UNW_SP(&info) >= PAGE_OFFSET) {
MSG("Leftover inexact backtrace:\n");
MSG("Leftover inexact backtrace:");
stack = (void *)UNW_SP(&info);
if (!stack)
return;
ebp = UNW_FP(&info);
} else
MSG("Full inexact backtrace again:\n");
MSG("Full inexact backtrace again:");
} else if (call_trace >= 1)
return;
else
MSG("Full inexact backtrace again:\n");
MSG("Full inexact backtrace again:");
} else
MSG("Inexact backtrace:\n");
MSG("Inexact backtrace:");
}
if (!stack) {
unsigned long dummy;
Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/x86_64/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,21 +280,21 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
if (unw_ret > 0) {
if (call_trace == 1 && !arch_unw_user_mode(&info)) {
ops->warning_symbol(data,
"DWARF2 unwinder stuck at %s\n",
"DWARF2 unwinder stuck at %s",
UNW_PC(&info));
if ((long)UNW_SP(&info) < 0) {
MSG("Leftover inexact backtrace:");
stack = (unsigned long *)UNW_SP(&info);
if (!stack)
return;
} else
MSG("Full inexact backtrace again:\n");
MSG("Full inexact backtrace again:");
} else if (call_trace >= 1)
return;
else
MSG("Full inexact backtrace again:\n");
MSG("Full inexact backtrace again:");
} else
MSG("Inexact backtrace:\n");
MSG("Inexact backtrace:");
}
if (!stack) {
unsigned long dummy;
Expand Down

0 comments on commit f5d1dad

Please sign in to comment.