From 7b4d62bad70b86527a4b500582655d6a0f48606a Mon Sep 17 00:00:00 2001
From: Robin Getz <robin.getz@analog.com>
Date: Mon, 29 Oct 2007 18:14:15 +0800
Subject: [PATCH] --- yaml --- r: 72877 b: refs/heads/master c:
 aa770aa790f3a5f3ff568388d02aea2ef78773ec h: refs/heads/master i:   72875:
 36aef9dd190ecbb60e661adfebd32478a4f560a1 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/blackfin/kernel/entry.S | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 049b93c25090..0c85242b7cff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7728ec33faf88605fb871b9b0ecf8e45d4359678
+refs/heads/master: aa770aa790f3a5f3ff568388d02aea2ef78773ec
diff --git a/trunk/arch/blackfin/kernel/entry.S b/trunk/arch/blackfin/kernel/entry.S
index 65c5ba4260b0..65f4e67a65c4 100644
--- a/trunk/arch/blackfin/kernel/entry.S
+++ b/trunk/arch/blackfin/kernel/entry.S
@@ -54,9 +54,11 @@ ENTRY(_ret_from_fork)
 	[sp + PT_IPEND] = r0;
 	/* do a 'fake' RTI by jumping to [RETI]
 	 * to avoid clearing supervisor mode in child
-	*/
+	 */
+	r0 = [sp + PT_PC];
+	[sp + PT_P0] = r0;
+
 	RESTORE_ALL_SYS
-	p0 = reti;
 	jump (p0);
 ENDPROC(_ret_from_fork)