diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
| commit | b8553086288629b4efb77e97f5582e08bc50ad65 (patch) | |
| tree | 0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /arch/sh/kernel/sys_sh.c | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'arch/sh/kernel/sys_sh.c')
| -rw-r--r-- | arch/sh/kernel/sys_sh.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c index 0b3d5fc2e..64007b236 100644 --- a/arch/sh/kernel/sys_sh.c +++ b/arch/sh/kernel/sys_sh.c @@ -35,9 +35,7 @@ asmlinkage int sys_pipe(unsigned long r4, unsigned long r5, int fd[2]; int error; - lock_kernel(); error = do_pipe(fd); - unlock_kernel(); if (!error) { regs.regs[1] = fd[1]; return fd[0]; @@ -60,10 +58,7 @@ do_mmap2(unsigned long addr, unsigned long len, unsigned long prot, } down(¤t->mm->mmap_sem); - lock_kernel(); - error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff); - unlock_kernel(); up(¤t->mm->mmap_sem); if (file) |