diff options
author | Andi Kleen <ak@suse.de> | 2006-12-06 20:14:00 -0500 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-06 20:14:00 -0500 |
commit | b615ebdac97c648a2ae7d23c5a0bbb3972adf928 (patch) | |
tree | febf50b76bd8396a80edfeec6ad88412f4515a34 /arch/i386/kernel/traps.c | |
parent | 9b483417527f2e47985856867c5716df013227c7 (diff) |
[PATCH] x86: shorten lines in unwinder to be <= 80 characters
Andrew complained about > 80 character lines in the new unwinder.
Fix that.
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386/kernel/traps.c')
-rw-r--r-- | arch/i386/kernel/traps.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index fe9c5e8e7e6f..fe81d89c50d3 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
@@ -173,6 +173,8 @@ dump_trace_unwind(struct unwind_frame_info *info, void *data) | |||
173 | return n; | 173 | return n; |
174 | } | 174 | } |
175 | 175 | ||
176 | #define MSG(msg) ops->warning(data, msg) | ||
177 | |||
176 | void dump_trace(struct task_struct *task, struct pt_regs *regs, | 178 | void dump_trace(struct task_struct *task, struct pt_regs *regs, |
177 | unsigned long *stack, | 179 | unsigned long *stack, |
178 | struct stacktrace_ops *ops, void *data) | 180 | struct stacktrace_ops *ops, void *data) |
@@ -191,29 +193,31 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
191 | if (unwind_init_frame_info(&info, task, regs) == 0) | 193 | if (unwind_init_frame_info(&info, task, regs) == 0) |
192 | unw_ret = dump_trace_unwind(&info, &oad); | 194 | unw_ret = dump_trace_unwind(&info, &oad); |
193 | } else if (task == current) | 195 | } else if (task == current) |
194 | unw_ret = unwind_init_running(&info, dump_trace_unwind, &oad); | 196 | unw_ret = unwind_init_running(&info, dump_trace_unwind, |
197 | &oad); | ||
195 | else { | 198 | else { |
196 | if (unwind_init_blocked(&info, task) == 0) | 199 | if (unwind_init_blocked(&info, task) == 0) |
197 | unw_ret = dump_trace_unwind(&info, &oad); | 200 | unw_ret = dump_trace_unwind(&info, &oad); |
198 | } | 201 | } |
199 | if (unw_ret > 0) { | 202 | if (unw_ret > 0) { |
200 | if (call_trace == 1 && !arch_unw_user_mode(&info)) { | 203 | if (call_trace == 1 && !arch_unw_user_mode(&info)) { |
201 | ops->warning_symbol(data, "DWARF2 unwinder stuck at %s\n", | 204 | ops->warning_symbol(data, |
205 | "DWARF2 unwinder stuck at %s\n", | ||
202 | UNW_PC(&info)); | 206 | UNW_PC(&info)); |
203 | if (UNW_SP(&info) >= PAGE_OFFSET) { | 207 | if (UNW_SP(&info) >= PAGE_OFFSET) { |
204 | ops->warning(data, "Leftover inexact backtrace:\n"); | 208 | MSG("Leftover inexact backtrace:\n"); |
205 | stack = (void *)UNW_SP(&info); | 209 | stack = (void *)UNW_SP(&info); |
206 | if (!stack) | 210 | if (!stack) |
207 | return; | 211 | return; |
208 | ebp = UNW_FP(&info); | 212 | ebp = UNW_FP(&info); |
209 | } else | 213 | } else |
210 | ops->warning(data, "Full inexact backtrace again:\n"); | 214 | MSG("Full inexact backtrace again:\n"); |
211 | } else if (call_trace >= 1) | 215 | } else if (call_trace >= 1) |
212 | return; | 216 | return; |
213 | else | 217 | else |
214 | ops->warning(data, "Full inexact backtrace again:\n"); | 218 | MSG("Full inexact backtrace again:\n"); |
215 | } else | 219 | } else |
216 | ops->warning(data, "Inexact backtrace:\n"); | 220 | MSG("Inexact backtrace:\n"); |
217 | } | 221 | } |
218 | if (!stack) { | 222 | if (!stack) { |
219 | unsigned long dummy; | 223 | unsigned long dummy; |