diff options
Diffstat (limited to 'arch/mips64/kernel')
| -rw-r--r-- | arch/mips64/kernel/ioctl32.c | 1 | ||||
| -rw-r--r-- | arch/mips64/kernel/process.c | 1 | ||||
| -rw-r--r-- | arch/mips64/kernel/signal.c | 2 | ||||
| -rw-r--r-- | arch/mips64/kernel/signal32.c | 10 | ||||
| -rw-r--r-- | arch/mips64/kernel/syscall.c | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/arch/mips64/kernel/ioctl32.c b/arch/mips64/kernel/ioctl32.c index f177ea94d..a284357a1 100644 --- a/arch/mips64/kernel/ioctl32.c +++ b/arch/mips64/kernel/ioctl32.c @@ -24,6 +24,7 @@ #include <linux/blkdev.h> #include <linux/elevator.h> #include <linux/auto_fs.h> +#include <linux/ext2_fs.h> #include <asm/types.h> #include <asm/uaccess.h> diff --git a/arch/mips64/kernel/process.c b/arch/mips64/kernel/process.c index 924140719..df03ef081 100644 --- a/arch/mips64/kernel/process.c +++ b/arch/mips64/kernel/process.c @@ -69,6 +69,7 @@ void flush_thread(void) } int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, + unsigned long unused, struct task_struct * p, struct pt_regs * regs) { struct pt_regs * childregs; diff --git a/arch/mips64/kernel/signal.c b/arch/mips64/kernel/signal.c index 81daadab8..15b2fc60b 100644 --- a/arch/mips64/kernel/signal.c +++ b/arch/mips64/kernel/signal.c @@ -695,7 +695,7 @@ asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs) /* FALLTHRU */ default: - sigaddset(¤t->signal, signr); + sigaddset(¤t->pending.signal, signr); recalc_sigpending(current); current->flags |= PF_SIGNALED; do_exit(exit_code); diff --git a/arch/mips64/kernel/signal32.c b/arch/mips64/kernel/signal32.c index 1988b681c..b3de6d4c9 100644 --- a/arch/mips64/kernel/signal32.c +++ b/arch/mips64/kernel/signal32.c @@ -773,7 +773,7 @@ printk("%s: delivering signal.\n", current->comm); /* FALLTHRU */ default: - sigaddset(¤t->signal, signr); + sigaddset(¤t->pending.signal, signr); recalc_sigpending(current); current->flags |= PF_SIGNALED; do_exit(exit_code); @@ -879,12 +879,12 @@ asmlinkage int sys32_rt_sigaction(int sig, const struct sigaction32 *act, if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact))) return -EFAULT; - err |= __put_user((u32)(u64)new_sa.sa.sa_handler, + err |= __put_user((u32)(u64)old_sa.sa.sa_handler, &oact->sa_handler); - err |= __put_user(new_sa.sa.sa_flags, &oact->sa_flags); - err |= __put_user((u32)(u64)new_sa.sa.sa_restorer, + err |= __put_user(old_sa.sa.sa_flags, &oact->sa_flags); + err |= __put_user((u32)(u64)old_sa.sa.sa_restorer, &oact->sa_restorer); - err |= put_sigset(&new_sa.sa.sa_mask, &oact->sa_mask); + err |= put_sigset(&old_sa.sa.sa_mask, &oact->sa_mask); if (err) return -EFAULT; } diff --git a/arch/mips64/kernel/syscall.c b/arch/mips64/kernel/syscall.c index daea69e6c..a69558792 100644 --- a/arch/mips64/kernel/syscall.c +++ b/arch/mips64/kernel/syscall.c @@ -77,7 +77,7 @@ asmlinkage int sys_fork(abi64_no_regargs, struct pt_regs regs) int res; save_static(®s); - res = do_fork(SIGCHLD, regs.regs[29], ®s); + res = do_fork(SIGCHLD, regs.regs[29], ®s, 0); return res; } @@ -92,7 +92,7 @@ asmlinkage int sys_clone(abi64_no_regargs, struct pt_regs regs) newsp = regs.regs[5]; if (!newsp) newsp = regs.regs[29]; - res = do_fork(clone_flags, newsp, ®s); + res = do_fork(clone_flags, newsp, ®s, 0); return res; } |