diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-12-20 21:59:55 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-20 21:59:55 -0500 |
commit | 76e7461a21dfe13565b2a323b53c8cc963541126 (patch) | |
tree | 8e399c71b38bb80c00d8a82310021b55ab6e8e33 /arch/x86/kernel/dumpstack_32.c | |
parent | d0b873fc73b793277c8a0824ce986b5bfeaef157 (diff) | |
parent | dd59f6c76b265ed2ff18b497d6105a9511b1feb1 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/kernel/dumpstack_32.c')
-rw-r--r-- | arch/x86/kernel/dumpstack_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c index e0ed4c7abb62..ae775ca47b25 100644 --- a/arch/x86/kernel/dumpstack_32.c +++ b/arch/x86/kernel/dumpstack_32.c | |||
@@ -58,7 +58,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, | |||
58 | 58 | ||
59 | context = (struct thread_info *) | 59 | context = (struct thread_info *) |
60 | ((unsigned long)stack & (~(THREAD_SIZE - 1))); | 60 | ((unsigned long)stack & (~(THREAD_SIZE - 1))); |
61 | bp = print_context_stack(context, stack, bp, ops, data, NULL, &graph); | 61 | bp = ops->walk_stack(context, stack, bp, ops, 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) |