diff options
Diffstat (limited to 'arch/x86/kernel/dumpstack_32.c')
| -rw-r--r-- | arch/x86/kernel/dumpstack_32.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c index f7dd2a7c3bf4..e0ed4c7abb62 100644 --- a/arch/x86/kernel/dumpstack_32.c +++ b/arch/x86/kernel/dumpstack_32.c | |||
| @@ -10,9 +10,9 @@ | |||
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/ptrace.h> | 11 | #include <linux/ptrace.h> |
| 12 | #include <linux/kexec.h> | 12 | #include <linux/kexec.h> |
| 13 | #include <linux/sysfs.h> | ||
| 13 | #include <linux/bug.h> | 14 | #include <linux/bug.h> |
| 14 | #include <linux/nmi.h> | 15 | #include <linux/nmi.h> |
| 15 | #include <linux/sysfs.h> | ||
| 16 | 16 | ||
| 17 | #include <asm/stacktrace.h> | 17 | #include <asm/stacktrace.h> |
| 18 | 18 | ||
| @@ -35,6 +35,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
| 35 | 35 | ||
| 36 | if (!stack) { | 36 | if (!stack) { |
| 37 | unsigned long dummy; | 37 | unsigned long dummy; |
| 38 | |||
| 38 | stack = &dummy; | 39 | stack = &dummy; |
| 39 | if (task && task != current) | 40 | if (task && task != current) |
| 40 | stack = (unsigned long *)task->thread.sp; | 41 | stack = (unsigned long *)task->thread.sp; |
| @@ -57,8 +58,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
| 57 | 58 | ||
| 58 | context = (struct thread_info *) | 59 | context = (struct thread_info *) |
| 59 | ((unsigned long)stack & (~(THREAD_SIZE - 1))); | 60 | ((unsigned long)stack & (~(THREAD_SIZE - 1))); |
| 60 | bp = print_context_stack(context, stack, bp, ops, | 61 | bp = print_context_stack(context, stack, bp, ops, data, NULL, &graph); |
| 61 | data, NULL, &graph); | ||
| 62 | 62 | ||
| 63 | stack = (unsigned long *)context->previous_esp; | 63 | stack = (unsigned long *)context->previous_esp; |
| 64 | if (!stack) | 64 | if (!stack) |
| @@ -72,7 +72,7 @@ EXPORT_SYMBOL(dump_trace); | |||
| 72 | 72 | ||
| 73 | void | 73 | void |
| 74 | show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, | 74 | show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, |
| 75 | unsigned long *sp, unsigned long bp, char *log_lvl) | 75 | unsigned long *sp, unsigned long bp, char *log_lvl) |
| 76 | { | 76 | { |
| 77 | unsigned long *stack; | 77 | unsigned long *stack; |
| 78 | int i; | 78 | int i; |
| @@ -156,4 +156,3 @@ int is_valid_bugaddr(unsigned long ip) | |||
| 156 | 156 | ||
| 157 | return ud2 == 0x0b0f; | 157 | return ud2 == 0x0b0f; |
| 158 | } | 158 | } |
| 159 | |||
