From a49803ee25cf4957b9305f725823f8365715421e Mon Sep 17 00:00:00 2001
From: Bernd Schmidt <bernds_cb1@t-online.de>
Date: Wed, 7 May 2008 11:41:26 +0800
Subject: [PATCH] --- yaml --- r: 96323 b: refs/heads/master c:
 ddb3f00ca0897f585128a6cca229eeb9d91fa6ef h: refs/heads/master i:   96321:
 aff08976d1b326a4e21c68359d09f1d7e0e99e19   96319:
 efa4e8a944fd6bb2853ff6724a42ffcf85689b98 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/blackfin/mach-common/entry.S | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c42e8fd7ded7..80a82a4f948b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bfb4b21c7c39295f5535c139f796df1d51ec009
+refs/heads/master: ddb3f00ca0897f585128a6cca229eeb9d91fa6ef
diff --git a/trunk/arch/blackfin/mach-common/entry.S b/trunk/arch/blackfin/mach-common/entry.S
index f2fb87e9a46e..7365a17a6a81 100644
--- a/trunk/arch/blackfin/mach-common/entry.S
+++ b/trunk/arch/blackfin/mach-common/entry.S
@@ -295,6 +295,11 @@ ENTRY(_double_fault)
          */
         SAVE_ALL_SYS
 
+	/* The dumping functions expect the return address in the RETI
+	 * slot.  */
+	r6 = retx;
+	[sp + PT_PC] = r6;
+
         r0 = sp;        /* stack frame pt_regs pointer argument ==> r0 */
         SP += -12;
         call _double_fault_c;