diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-11-06 03:23:33 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-06 03:23:33 -0500 |
commit | 421b541110b20ccff1a7ff3245439cb24efe9812 (patch) | |
tree | 1a03b8e813e6e0036b83575c1e92993c838d7155 | |
parent | 345e5a7672f561b539b3249cbe437b8d6595ab1b (diff) |
sh: unwinder: Fix up invalid PC refetch in dwarf unwinder.
The dwarf unwinder presently attempts to provide a sane PC value if none
is provided, however the logic is broken and cases where a previous valid
dwarf frame exists along with a bogus PC value can still proceed. This
fixes up the test and prevents the unwinder from blowing up.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-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 2d07084e4882..d76a23170dbb 100644 --- a/arch/sh/kernel/dwarf.c +++ b/arch/sh/kernel/dwarf.c | |||
@@ -555,7 +555,7 @@ struct dwarf_frame * dwarf_unwind_stack(unsigned long pc, | |||
555 | * NOTE: the return address is guaranteed to be setup by the | 555 | * NOTE: the return address is guaranteed to be setup by the |
556 | * time this function makes its first function call. | 556 | * time this function makes its first function call. |
557 | */ | 557 | */ |
558 | if (!pc && !prev) | 558 | if (!pc || !prev) |
559 | pc = (unsigned long)current_text_addr(); | 559 | pc = (unsigned long)current_text_addr(); |
560 | 560 | ||
561 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 561 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |