From 026bda94bfd28ad05f6f69c35979771528931731 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Thu, 4 Mar 2010 15:33:16 +0100
Subject: [PATCH] --- yaml --- r: 187720 b: refs/heads/master c:
 51d47999b9452a8dc7ae58a11423c5db28f21ae1 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/kernel/unwind.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index efdaabef61ad..eb544f90f289 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d40ddd10dab332456e3863fed2a6e71aa6635ab
+refs/heads/master: 51d47999b9452a8dc7ae58a11423c5db28f21ae1
diff --git a/trunk/arch/arm/kernel/unwind.c b/trunk/arch/arm/kernel/unwind.c
index 786ac2b6914a..50292cd9c120 100644
--- a/trunk/arch/arm/kernel/unwind.c
+++ b/trunk/arch/arm/kernel/unwind.c
@@ -359,7 +359,9 @@ void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk)
 		frame.fp = regs->ARM_fp;
 		frame.sp = regs->ARM_sp;
 		frame.lr = regs->ARM_lr;
-		frame.pc = regs->ARM_pc;
+		/* PC might be corrupted, use LR in that case. */
+		frame.pc = kernel_text_address(regs->ARM_pc)
+			 ? regs->ARM_pc : regs->ARM_lr;
 	} else if (tsk == current) {
 		frame.fp = (unsigned long)__builtin_frame_address(0);
 		frame.sp = current_sp;