diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /arch/mips/kernel/signal.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'arch/mips/kernel/signal.c')
| -rw-r--r-- | arch/mips/kernel/signal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c index c974cc9b30eb..402efd27c79e 100644 --- a/arch/mips/kernel/signal.c +++ b/arch/mips/kernel/signal.c | |||
| @@ -100,8 +100,8 @@ _sys_rt_sigsuspend(nabi_no_regargs struct pt_regs regs) | |||
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | #ifdef CONFIG_TRAD_SIGNALS | 102 | #ifdef CONFIG_TRAD_SIGNALS |
| 103 | asmlinkage int sys_sigaction(int sig, const struct sigaction *act, | 103 | asmlinkage int sys_sigaction(int sig, const struct sigaction __user *act, |
| 104 | struct sigaction *oact) | 104 | struct sigaction __user *oact) |
| 105 | { | 105 | { |
| 106 | struct k_sigaction new_ka, old_ka; | 106 | struct k_sigaction new_ka, old_ka; |
| 107 | int ret; | 107 | int ret; |
| @@ -331,7 +331,7 @@ int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs, | |||
| 331 | /* Create the ucontext. */ | 331 | /* Create the ucontext. */ |
| 332 | err |= __put_user(0, &frame->rs_uc.uc_flags); | 332 | err |= __put_user(0, &frame->rs_uc.uc_flags); |
| 333 | err |= __put_user(NULL, &frame->rs_uc.uc_link); | 333 | err |= __put_user(NULL, &frame->rs_uc.uc_link); |
| 334 | err |= __put_user((void *)current->sas_ss_sp, | 334 | err |= __put_user((void __user *)current->sas_ss_sp, |
| 335 | &frame->rs_uc.uc_stack.ss_sp); | 335 | &frame->rs_uc.uc_stack.ss_sp); |
| 336 | err |= __put_user(sas_ss_flags(regs->regs[29]), | 336 | err |= __put_user(sas_ss_flags(regs->regs[29]), |
| 337 | &frame->rs_uc.uc_stack.ss_flags); | 337 | &frame->rs_uc.uc_stack.ss_flags); |