diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /arch/sparc/kernel/sys_sparc.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'arch/sparc/kernel/sys_sparc.c')
| -rw-r--r-- | arch/sparc/kernel/sys_sparc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c index 7529c679a..e5ea2e9b3 100644 --- a/arch/sparc/kernel/sys_sparc.c +++ b/arch/sparc/kernel/sys_sparc.c @@ -1,4 +1,4 @@ -/* $Id: sys_sparc.c,v 1.46 1998/08/03 23:58:01 davem Exp $ +/* $Id: sys_sparc.c,v 1.49 1998/10/11 06:57:53 davem Exp $ * linux/arch/sparc/kernel/sys_sparc.c * * This file contains various random system calls that @@ -181,6 +181,7 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len, struct file * file = NULL; unsigned long retval = -EBADF; + down(¤t->mm->mmap_sem); lock_kernel(); if (!(flags & MAP_ANONYMOUS)) { file = fget(fd); @@ -206,6 +207,7 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len, } } + flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE); retval = do_mmap(file, addr, len, prot, flags, off); out_putf: @@ -213,6 +215,7 @@ out_putf: fput(file); out: unlock_kernel(); + up(¤t->mm->mmap_sem); return retval; } @@ -298,6 +301,11 @@ sys_rt_sigaction(int sig, const struct sigaction *act, struct sigaction *oact, if (sigsetsize != sizeof(sigset_t)) return -EINVAL; + /* All tasks which use RT signals (effectively) use + * new style signals. + */ + current->tss.new_signal = 1; + if (act) { new_ka.ka_restorer = restorer; if (copy_from_user(&new_ka.sa, act, sizeof(*act))) |