diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
| commit | b0d44c0dbbd52effb731b1c0af9afd56215c48de (patch) | |
| tree | 3237c0087d91a5390aed05689b9f610ba16fa116 /arch/x86/kernel/dumpstack.c | |
| parent | 9537a48ed4b9e4b738943d6da0a0fd4278adf905 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'arch/x86/kernel/dumpstack.c')
| -rw-r--r-- | arch/x86/kernel/dumpstack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 6b1f6f6f8661..87d103ded1c3 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
| @@ -99,7 +99,7 @@ print_context_stack(struct thread_info *tinfo, | |||
| 99 | frame = frame->next_frame; | 99 | frame = frame->next_frame; |
| 100 | bp = (unsigned long) frame; | 100 | bp = (unsigned long) frame; |
| 101 | } else { | 101 | } else { |
| 102 | ops->address(data, addr, bp == 0); | 102 | ops->address(data, addr, 0); |
| 103 | } | 103 | } |
| 104 | print_ftrace_graph_addr(addr, data, ops, tinfo, graph); | 104 | print_ftrace_graph_addr(addr, data, ops, tinfo, graph); |
| 105 | } | 105 | } |