diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-11-09 02:55:36 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-09 02:55:36 +0100 |
commit | 76d2318020bf0c0c497af986a25977196715a1b9 (patch) | |
tree | 25df17084b76eba7420c3fe9e6690ea5270e7dfd /arch/sh/kernel/dwarf.c | |
parent | sh: oprofile: Fix up count size mismatch for common impl. (diff) | |
parent | sh: Replace old style lock initializer (diff) | |
download | linux-76d2318020bf0c0c497af986a25977196715a1b9.tar.xz linux-76d2318020bf0c0c497af986a25977196715a1b9.zip |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/kernel/dwarf.c')
-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, * NOTE: the return address is guaranteed to be setup by the * time this function makes its first function call. */ - if (!pc && !prev) + if (!pc || !prev) pc = (unsigned long)current_text_addr(); #ifdef CONFIG_FUNCTION_GRAPH_TRACER |