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/ppc | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/8260_io/uart.c | 4 | ||||
| -rw-r--r-- | arch/ppc/8xx_io/uart.c | 4 | ||||
| -rw-r--r-- | arch/ppc/config.in | 2 | ||||
| -rw-r--r-- | arch/ppc/kernel/syscalls.c | 4 |
4 files changed, 1 insertions, 13 deletions
diff --git a/arch/ppc/8260_io/uart.c b/arch/ppc/8260_io/uart.c index ff91c6a45..caa5ca8b0 100644 --- a/arch/ppc/8260_io/uart.c +++ b/arch/ppc/8260_io/uart.c @@ -2318,10 +2318,6 @@ int __init rs_8xx_init(void) volatile iop8260_t *io; init_bh(SERIAL_BH, do_serial_bh); -#if 0 - timer_table[RS_TIMER].fn = rs_8xx_timer; - timer_table[RS_TIMER].expires = 0; -#endif show_serial_version(); diff --git a/arch/ppc/8xx_io/uart.c b/arch/ppc/8xx_io/uart.c index 0c53be922..00f4fa86c 100644 --- a/arch/ppc/8xx_io/uart.c +++ b/arch/ppc/8xx_io/uart.c @@ -2437,10 +2437,6 @@ int __init rs_8xx_init(void) volatile immap_t *immap; init_bh(SERIAL_BH, do_serial_bh); -#if 0 - timer_table[RS_TIMER].fn = rs_8xx_timer; - timer_table[RS_TIMER].expires = 0; -#endif show_serial_version(); diff --git a/arch/ppc/config.in b/arch/ppc/config.in index f72735bc2..33f6eaa95 100644 --- a/arch/ppc/config.in +++ b/arch/ppc/config.in @@ -183,7 +183,7 @@ if [ "$CONFIG_APUS" = "y" ]; then fi endmenu - +source drivers/mtd/Config.in source drivers/pnp/Config.in source drivers/block/Config.in #source drivers.new/Config.in diff --git a/arch/ppc/kernel/syscalls.c b/arch/ppc/kernel/syscalls.c index e31b34cc9..08d0bc44b 100644 --- a/arch/ppc/kernel/syscalls.c +++ b/arch/ppc/kernel/syscalls.c @@ -184,9 +184,7 @@ asmlinkage int sys_pipe(int *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; @@ -201,7 +199,6 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, size_t len, struct file * file = NULL; int ret = -EBADF; - lock_kernel(); if (!(flags & MAP_ANONYMOUS)) { if (!(file = fget(fd))) goto out; @@ -214,7 +211,6 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, size_t len, if (file) fput(file); out: - unlock_kernel(); return ret; } |