From: Guo Ren <ren_guo@c-sky.com>
Date: Sun, 9 Dec 2018 05:18:15 +0000 (+0800)
Subject: csky: remove syscall_exit_work
X-Git-Tag: v5.0-rc1~37^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31295a72b525721d10737260aea6918fb34607be;p=thirdparty%2Fkernel%2Flinux.git

csky: remove syscall_exit_work

Remove syscall_exit_work and union all to ret_from_exception.

Signed-off-by: Guo Ren <ren_guo@c-sky.com>
---

diff --git a/arch/csky/kernel/entry.S b/arch/csky/kernel/entry.S
index 79f92b8606c8a..2b4a8515f7e54 100644
--- a/arch/csky/kernel/entry.S
+++ b/arch/csky/kernel/entry.S
@@ -183,18 +183,10 @@ ENTRY(csky_systemcall)
 #endif
 	stw	a0, (sp, LSAVE_A0)	/* Save return value */
 
-	movi	a0, 1			/* leave system call */
-	mov	a1, sp			/* sp = pt_regs pointer */
-	jbsr	syscall_trace
-
-syscall_exit_work:
-	ld	syscallid, (sp, LSAVE_PSR)
-	btsti	syscallid, 31
-	bt	2f
-
-	jmpi	resume_userspace
-
-2:      RESTORE_ALL
+	movi    a0, 1                   /* leave system call */
+	mov     a1, sp                  /* right now, sp --> pt_regs */
+	jbsr    syscall_trace
+	br	ret_from_exception
 
 ENTRY(ret_from_kernel_thread)
 	jbsr	schedule_tail