diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-08 20:55:36 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-08 20:55:36 -0500 |
| commit | 76d2318020bf0c0c497af986a25977196715a1b9 (patch) | |
| tree | 25df17084b76eba7420c3fe9e6690ea5270e7dfd /arch/sh/kernel | |
| parent | e9c4148fd4f03008ecbe3b673e25764232a15503 (diff) | |
| parent | 969e46a8533a3e40ce2146f6764a963b1f5505da (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/dwarf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c index 6c9d0c10f2be..3576b709f052 100644 --- a/arch/sh/kernel/dwarf.c +++ b/arch/sh/kernel/dwarf.c | |||
| @@ -567,7 +567,7 @@ struct dwarf_frame * dwarf_unwind_stack(unsigned long pc, | |||
| 567 | * NOTE: the return address is guaranteed to be setup by the | 567 | * NOTE: the return address is guaranteed to be setup by the |
| 568 | * time this function makes its first function call. | 568 | * time this function makes its first function call. |
| 569 | */ | 569 | */ |
| 570 | if (!pc && !prev) | 570 | if (!pc || !prev) |
| 571 | pc = (unsigned long)current_text_addr(); | 571 | pc = (unsigned long)current_text_addr(); |
| 572 | 572 | ||
| 573 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 573 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |