diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-05-05 16:11:35 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-09-22 09:47:31 -0400 |
commit | 02f884ed46b38c5c386709b2619730ba7a8d200c (patch) | |
tree | 9be3af63e825bce7e8175c9bc4956c7ad26b1c1b /arch/mips/kernel/scall64-64.S | |
parent | 0b894bd8e462644fceb290adf5b349ef834d761b (diff) |
MIPS: Merge the identical "return from syscall" per-ABI code
No need to keep 4 copies of that stuff; merged and taken to
entry.S, unused public symbols there killed off.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/scall64-64.S')
-rw-r--r-- | arch/mips/kernel/scall64-64.S | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 3b5a5e9ae49c..b83dc8b2832c 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
@@ -72,18 +72,7 @@ NESTED(handle_sys64, PT_SIZE, sp) | |||
72 | 1: sd v0, PT_R2(sp) # result | 72 | 1: sd v0, PT_R2(sp) # result |
73 | 73 | ||
74 | n64_syscall_exit: | 74 | n64_syscall_exit: |
75 | local_irq_disable # make sure need_resched and | 75 | j syscall_exit_partial |
76 | # signals dont change between | ||
77 | # sampling and return | ||
78 | LONG_L a2, TI_FLAGS($28) # current->work | ||
79 | li t0, _TIF_ALLWORK_MASK | ||
80 | and t0, a2, t0 | ||
81 | bnez t0, n64_syscall_exit_work | ||
82 | |||
83 | j restore_partial | ||
84 | |||
85 | n64_syscall_exit_work: | ||
86 | j syscall_exit_work_partial | ||
87 | 76 | ||
88 | /* ------------------------------------------------------------------------ */ | 77 | /* ------------------------------------------------------------------------ */ |
89 | 78 | ||