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/s390 | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/config.in | 3 | ||||
| -rw-r--r-- | arch/s390/kernel/sys_s390.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/s390/config.in b/arch/s390/config.in index 9e946365f..96686af33 100644 --- a/arch/s390/config.in +++ b/arch/s390/config.in @@ -57,6 +57,9 @@ fi source fs/Config.in +# Not sure about this one. dwmw2 +# source drivers/mtd/Config.in + # source drivers/char/Config.in mainmenu_option next_comment diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index 268ea007a..b00d88a62 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c @@ -37,9 +37,7 @@ asmlinkage int sys_pipe(unsigned long * fildes) int fd[2]; int error; - lock_kernel(); error = do_pipe(fd); - unlock_kernel(); if (!error) { if (copy_to_user(fildes, fd, 2*sizeof(int))) error = -EFAULT; @@ -64,11 +62,7 @@ static inline long do_mmap2( } 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) |