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/arm | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/config.in | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/sys_arm.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/config.in b/arch/arm/config.in index 15fba3403..e270007f9 100644 --- a/arch/arm/config.in +++ b/arch/arm/config.in @@ -271,6 +271,8 @@ if [ "$CONFIG_SCSI" != "n" ]; then fi endmenu +source drivers/mtd/Config.in + source drivers/ieee1394/Config.in source drivers/i2o/Config.in diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c index 93c539ffd..e1617fbaa 100644 --- a/arch/arm/kernel/sys_arm.c +++ b/arch/arm/kernel/sys_arm.c @@ -39,9 +39,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; @@ -66,11 +64,7 @@ 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) |