aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/signal.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-10-18 01:43:27 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-28 21:49:04 -0500
commitb960f303448969c6cb76b4df9291e9e6213e2b9f (patch)
treebfb606dd0cb16673e61213ab4472933e67f39857 /arch/alpha/kernel/signal.c
parente0e431aa45416982eb3fddf34cedc72f1c3b3ce3 (diff)
alpha: don't pass useless arguments to do_{,rt_},sigreturn()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/alpha/kernel/signal.c')
-rw-r--r--arch/alpha/kernel/signal.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c
index 32575f85507d..336393c9c11f 100644
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
@@ -160,10 +160,10 @@ extern char compile_time_assert
160#define INSN_CALLSYS 0x00000083 160#define INSN_CALLSYS 0x00000083
161 161
162static long 162static long
163restore_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, 163restore_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs)
164 struct switch_stack *sw)
165{ 164{
166 unsigned long usp; 165 unsigned long usp;
166 struct switch_stack *sw = (struct switch_stack *)regs - 1;
167 long i, err = __get_user(regs->pc, &sc->sc_pc); 167 long i, err = __get_user(regs->pc, &sc->sc_pc);
168 168
169 current_thread_info()->restart_block.fn = do_no_restart_syscall; 169 current_thread_info()->restart_block.fn = do_no_restart_syscall;
@@ -215,9 +215,9 @@ restore_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
215 registers and transfer control from userland. */ 215 registers and transfer control from userland. */
216 216
217asmlinkage void 217asmlinkage void
218do_sigreturn(struct sigcontext __user *sc, struct pt_regs *regs, 218do_sigreturn(struct sigcontext __user *sc)
219 struct switch_stack *sw)
220{ 219{
220 struct pt_regs *regs = current_pt_regs();
221 sigset_t set; 221 sigset_t set;
222 222
223 /* Verify that it's a good sigcontext before using it */ 223 /* Verify that it's a good sigcontext before using it */
@@ -228,7 +228,7 @@ do_sigreturn(struct sigcontext __user *sc, struct pt_regs *regs,
228 228
229 set_current_blocked(&set); 229 set_current_blocked(&set);
230 230
231 if (restore_sigcontext(sc, regs, sw)) 231 if (restore_sigcontext(sc, regs))
232 goto give_sigsegv; 232 goto give_sigsegv;
233 233
234 /* Send SIGTRAP if we're single-stepping: */ 234 /* Send SIGTRAP if we're single-stepping: */
@@ -249,9 +249,9 @@ give_sigsegv:
249} 249}
250 250
251asmlinkage void 251asmlinkage void
252do_rt_sigreturn(struct rt_sigframe __user *frame, struct pt_regs *regs, 252do_rt_sigreturn(struct rt_sigframe __user *frame)
253 struct switch_stack *sw)
254{ 253{
254 struct pt_regs *regs = current_pt_regs();
255 sigset_t set; 255 sigset_t set;
256 256
257 /* Verify that it's a good ucontext_t before using it */ 257 /* Verify that it's a good ucontext_t before using it */
@@ -262,7 +262,7 @@ do_rt_sigreturn(struct rt_sigframe __user *frame, struct pt_regs *regs,
262 262
263 set_current_blocked(&set); 263 set_current_blocked(&set);
264 264
265 if (restore_sigcontext(&frame->uc.uc_mcontext, regs, sw)) 265 if (restore_sigcontext(&frame->uc.uc_mcontext, regs))
266 goto give_sigsegv; 266 goto give_sigsegv;
267 267
268 /* Send SIGTRAP if we're single-stepping: */ 268 /* Send SIGTRAP if we're single-stepping: */