diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /arch/x86/kernel/dumpstack.c | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
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 c0852291b623..dd2130b0fb3e 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
| @@ -100,7 +100,7 @@ print_context_stack(struct thread_info *tinfo, | |||
| 100 | frame = frame->next_frame; | 100 | frame = frame->next_frame; |
| 101 | bp = (unsigned long) frame; | 101 | bp = (unsigned long) frame; |
| 102 | } else { | 102 | } else { |
| 103 | ops->address(data, addr, bp == 0); | 103 | ops->address(data, addr, 0); |
| 104 | } | 104 | } |
| 105 | print_ftrace_graph_addr(addr, data, ops, tinfo, graph); | 105 | print_ftrace_graph_addr(addr, data, ops, tinfo, graph); |
| 106 | } | 106 | } |