aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/entry.S
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-09-29 23:28:59 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-01-07 08:01:33 -0500
commite68847fee706c6fe74c9afc3288c3adfc131b1fa (patch)
tree5012dca75c9977a55274484512846cb924afe195 /arch/m68k/kernel/entry.S
parent35fc157baf56db846afaeb5c730fa47e351cf0d2 (diff)
m68k: Switch to saner sigsuspend()
and saner do_signal() arguments, while we are at it Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/kernel/entry.S')
-rw-r--r--arch/m68k/kernel/entry.S19
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index 6360c437dcf5..3a15a03297a7 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -174,9 +174,8 @@ do_signal_return:
174 subql #4,%sp | dummy return address 174 subql #4,%sp | dummy return address
175 SAVE_SWITCH_STACK 175 SAVE_SWITCH_STACK
176 pea %sp@(SWITCH_STACK_SIZE) 176 pea %sp@(SWITCH_STACK_SIZE)
177 clrl %sp@-
178 bsrl do_signal 177 bsrl do_signal
179 addql #8,%sp 178 addql #4,%sp
180 RESTORE_SWITCH_STACK 179 RESTORE_SWITCH_STACK
181 addql #4,%sp 180 addql #4,%sp
182 tstl %d0 181 tstl %d0
@@ -290,22 +289,6 @@ ENTRY(sys_vfork)
290 RESTORE_SWITCH_STACK 289 RESTORE_SWITCH_STACK
291 rts 290 rts
292 291
293ENTRY(sys_sigsuspend)
294 SAVE_SWITCH_STACK
295 pea %sp@(SWITCH_STACK_SIZE)
296 jbsr do_sigsuspend
297 addql #4,%sp
298 RESTORE_SWITCH_STACK
299 rts
300
301ENTRY(sys_rt_sigsuspend)
302 SAVE_SWITCH_STACK
303 pea %sp@(SWITCH_STACK_SIZE)
304 jbsr do_rt_sigsuspend
305 addql #4,%sp
306 RESTORE_SWITCH_STACK
307 rts
308
309ENTRY(sys_sigreturn) 292ENTRY(sys_sigreturn)
310 SAVE_SWITCH_STACK 293 SAVE_SWITCH_STACK
311 jbsr do_sigreturn 294 jbsr do_sigreturn