summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-11-09 10:55:36 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-11-09 10:55:36 +0900
commit76d2318020bf0c0c497af986a25977196715a1b9 (patch)
tree25df17084b76eba7420c3fe9e6690ea5270e7dfd /arch/sh/kernel
parente9c4148fd4f03008ecbe3b673e25764232a15503 (diff)
parent969e46a8533a3e40ce2146f6764a963b1f5505da (diff)
downloadop-kernel-dev-76d2318020bf0c0c497af986a25977196715a1b9.zip
op-kernel-dev-76d2318020bf0c0c497af986a25977196715a1b9.tar.gz
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r--arch/sh/kernel/dwarf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/dwarf.c b/arch/sh/kernel/dwarf.c
index 6c9d0c1..3576b70 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
OpenPOWER on IntegriCloud