1 files changed, 21 insertions, 7 deletions

diff --git a/arch/unicore32/kernel/entry.S b/arch/unicore32/kernel/entry.S
index 581630d9144..00a259f9819 100644
--- a/arch/unicore32/kernel/entry.S
+++ b/arch/unicore32/kernel/entry.S
@@ -544,6 +544,8 @@ fast_work_pending:
 work_pending:
         cand.a  r1, #_TIF_NEED_RESCHED
         bne     work_resched
+        cand.a  r1, #_TIF_SIGPENDING|_TIF_NOTIFY_RESUME
+        beq     no_work_pending
         mov     r0, sp                          @ 'regs'
         mov     r2, why                         @ 'syscall'
         cand.a  r1, #_TIF_SIGPENDING            @ delivering a signal?
@@ -573,16 +575,17 @@ ENDPROC(ret_to_user)
  */
 ENTRY(ret_from_fork)
         b.l     schedule_tail
+        get_thread_info tsk
+        ldw     r1, [tsk+], #TI_FLAGS           @ check for syscall tracing
+        mov     why, #1
+        cand.a  r1, #_TIF_SYSCALL_TRACE         @ are we tracing syscalls?
+        beq     ret_slow_syscall
+        mov     r1, sp
+        mov     r0, #1                          @ trace exit [IP = 1]
+        b.l     syscall_trace
         b       ret_slow_syscall
 ENDPROC(ret_from_fork)
 
-ENTRY(ret_from_kernel_thread)
-        b.l     schedule_tail
-        mov     r0, r5
-        adr     lr, ret_slow_syscall
-        mov     pc, r4
-ENDPROC(ret_from_kernel_thread)
-
 /*=============================================================================
  * SWI handler
  *-----------------------------------------------------------------------------
@@ -668,6 +671,17 @@ __cr_alignment:
 #endif
         .ltorg
 
+ENTRY(sys_execve)
+                add     r3, sp, #S_OFF
+                b       __sys_execve
+ENDPROC(sys_execve)
+
+ENTRY(sys_clone)
+                add     ip, sp, #S_OFF
+                stw     ip, [sp+], #4
+                b       __sys_clone
+ENDPROC(sys_clone)
+
 ENTRY(sys_rt_sigreturn)
                 add     r0, sp, #S_OFF
                 mov     why, #0         @ prevent syscall restart handling