diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 10:44:14 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 10:45:01 -0500 |
commit | f0ef03985130287c6c84ebe69416cf790e6cc00e (patch) | |
tree | 3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7 /arch/x86/kernel/dumpstack.c | |
parent | 16097439703bcd38e9fe5608c12add6dacb825ea (diff) | |
parent | 31bbed527e7039203920c51c9fb48c27aed0820c (diff) |
Merge branch 'x86/core' into tracing/textedit
Conflicts:
arch/x86/Kconfig
block/blktrace.c
kernel/irq/handle.c
Semantic conflict:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 4325165753d8..95ea5fa7d444 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
@@ -101,7 +101,7 @@ print_context_stack(struct thread_info *tinfo, | |||
101 | frame = frame->next_frame; | 101 | frame = frame->next_frame; |
102 | bp = (unsigned long) frame; | 102 | bp = (unsigned long) frame; |
103 | } else { | 103 | } else { |
104 | ops->address(data, addr, bp == 0); | 104 | ops->address(data, addr, 0); |
105 | } | 105 | } |
106 | print_ftrace_graph_addr(addr, data, ops, tinfo, graph); | 106 | print_ftrace_graph_addr(addr, data, ops, tinfo, graph); |
107 | } | 107 | } |