1 files changed, 8 insertions, 47 deletions

diff --git a/arch/blackfin/kernel/entry.S b/arch/blackfin/kernel/entry.S
index f33792cc1a0d..4071265fc4fe 100644
--- a/arch/blackfin/kernel/entry.S
+++ b/arch/blackfin/kernel/entry.S
@@ -46,53 +46,14 @@ ENTRY(_ret_from_fork)
         SP += -12;
         pseudo_long_call _schedule_tail, p5;
         SP += 12;
-        r0 = [sp + PT_IPEND];
-        cc = bittst(r0,1);
-        if cc jump .Lin_kernel;
+        p1 = [sp++];
+        r0 = [sp++];
+        cc = p1 == 0;
+        if cc jump .Lfork;
+        sp += -12;
+        call (p1);
+        sp += 12;
+.Lfork:
         RESTORE_CONTEXT
         rti;
-.Lin_kernel:
-        bitclr(r0,1);
-        [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
-        jump (p0);
 ENDPROC(_ret_from_fork)
-
-ENTRY(_sys_vfork)
-        r0 = sp;
-        r0 += 24;
-        [--sp] = rets;
-        SP += -12;
-        pseudo_long_call _bfin_vfork, p2;
-        SP += 12;
-        rets = [sp++];
-        rts;
-ENDPROC(_sys_vfork)
-
-ENTRY(_sys_clone)
-        r0 = sp;
-        r0 += 24;
-        [--sp] = rets;
-        SP += -12;
-        pseudo_long_call _bfin_clone, p2;
-        SP += 12;
-        rets = [sp++];
-        rts;
-ENDPROC(_sys_clone)
-
-ENTRY(_sys_rt_sigreturn)
-        r0 = sp;
-        r0 += 24;
-        [--sp] = rets;
-        SP += -12;
-        pseudo_long_call _do_rt_sigreturn, p2;
-        SP += 12;
-        rets = [sp++];
-        rts;
-ENDPROC(_sys_rt_sigreturn)