Merge with 2.3.99-pre9.

13 files changed, 22 insertions, 58 deletions

diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile
index b57e662da..edb6b0571 100644
--- a/arch/sparc64/kernel/Makefile
+++ b/arch/sparc64/kernel/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.53 2000/03/31 04:06:22 davem Exp $
+# $Id: Makefile,v 1.54 2000/05/12 23:51:24 davem Exp $
 # Makefile for the linux kernel.
 #
 # Note! Dependencies are done automagically by 'make dep', which also
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index b3fade43e..5e855ad2c 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -1,4 +1,4 @@
-/* $Id: head.S,v 1.64 2000/03/06 22:33:42 davem Exp $
+/* $Id: head.S,v 1.65 2000/05/09 17:40:13 davem Exp $
  * head.S: Initial boot code for the Sparc64 port of Linux.
  *
  * Copyright (C) 1996,1997 David S. Miller (davem@caip.rutgers.edu)
diff --git a/arch/sparc64/kernel/ioctl32.c b/arch/sparc64/kernel/ioctl32.c
index 4eb22ea47..6c00ba2f6 100644
--- a/arch/sparc64/kernel/ioctl32.c
+++ b/arch/sparc64/kernel/ioctl32.c
@@ -1,4 +1,4 @@
-/* $Id: ioctl32.c,v 1.89 2000/05/06 10:38:42 davem Exp $
+/* $Id: ioctl32.c,v 1.90 2000/05/22 07:29:39 davem Exp $
  * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
  *
  * Copyright (C) 1997-2000  Jakub Jelinek  (jakub@redhat.com)
@@ -2400,39 +2400,6 @@ static int blkpg_ioctl_trans(unsigned int fd, unsigned int cmd, struct blkpg_ioc
 	return err;
 }
 
-typedef struct blkelv_ioctl32_arg_s {
-	u32 queue_ID;
-	int read_latency;
-	int write_latency;
-	int max_bomb_segments;
-} blkelv_ioctl32_arg_t;
-
-static int do_blkelv_ioctl(unsigned int fd, unsigned int cmd, blkelv_ioctl32_arg_t *arg)
-{
-	blkelv_ioctl_arg_t b;
-	int err;
-	mm_segment_t old_fs = get_fs();
-
-	if (cmd == BLKELVSET) {	
-		err = get_user((long)b.queue_ID, &arg->queue_ID);
-		err |= __get_user(b.read_latency, &arg->read_latency);
-		err |= __get_user(b.write_latency, &arg->write_latency);
-		err |= __get_user(b.max_bomb_segments, &arg->max_bomb_segments);
-		if (err) return err;
-	}
-	set_fs (KERNEL_DS);
-	err = sys_ioctl(fd, cmd, (unsigned long)&b);
-	set_fs (old_fs);
-	if (cmd == BLKELVGET && !err) {
-		err = put_user((long)b.queue_ID, &arg->queue_ID);
-		err |= __put_user(b.read_latency, &arg->read_latency);
-		err |= __put_user(b.write_latency, &arg->write_latency);
-		err |= __put_user(b.max_bomb_segments, &arg->max_bomb_segments);
-		if (err) return err;
-	}
-	return err;
-}
-
 static int ioc_settimeout(unsigned int fd, unsigned int cmd, unsigned long arg)
 {
 	return rw_long(fd, AUTOFS_IOC_SETTIMEOUT, arg);
@@ -2994,6 +2961,9 @@ COMPATIBLE_IOCTL(LV_SET_ACCESS)
 COMPATIBLE_IOCTL(LV_SET_STATUS)
 COMPATIBLE_IOCTL(LV_SET_ALLOCATION)
 #endif /* LVM */
+/* elevator */
+COMPATIBLE_IOCTL(BLKELVGET)
+COMPATIBLE_IOCTL(BLKELVSET)
 /* And these ioctls need translation */
 HANDLE_IOCTL(SIOCGIFNAME, dev_ifname32)
 HANDLE_IOCTL(SIOCGIFCONF, dev_ifconf)
@@ -3040,8 +3010,6 @@ HANDLE_IOCTL(0x1260, broken_blkgetsize)
 HANDLE_IOCTL(BLKFRAGET, w_long)
 HANDLE_IOCTL(BLKSECTGET, w_long)
 HANDLE_IOCTL(BLKPG, blkpg_ioctl_trans)
-HANDLE_IOCTL(BLKELVGET, do_blkelv_ioctl)
-HANDLE_IOCTL(BLKELVSET, do_blkelv_ioctl)
 HANDLE_IOCTL(FBIOPUTCMAP32, fbiogetputcmap)
 HANDLE_IOCTL(FBIOGETCMAP32, fbiogetputcmap)
 HANDLE_IOCTL(FBIOSCURSOR32, fbiogscursor)
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 16ec61db0..eb6f789f6 100644
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -1,4 +1,4 @@
-/* $Id: irq.c,v 1.86 2000/04/15 06:02:50 davem Exp $
+/* $Id: irq.c,v 1.87 2000/05/09 17:40:13 davem Exp $
  * irq.c: UltraSparc IRQ handling/init/registry.
  *
  * Copyright (C) 1997  David S. Miller  (davem@caip.rutgers.edu)
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index f691e9ca5..060d1c477 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -1,4 +1,4 @@
-/*  $Id: process.c,v 1.106 2000/04/15 06:02:50 davem Exp $
+/*  $Id: process.c,v 1.107 2000/05/09 17:40:14 davem Exp $
  *  arch/sparc64/kernel/process.c
  *
  *  Copyright (C) 1995, 1996 David S. Miller (davem@caip.rutgers.edu)
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 824097fa0..0f3e5c069 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -1,4 +1,4 @@
-/*  $Id: setup.c,v 1.53 2000/03/15 14:42:52 jj Exp $
+/*  $Id: setup.c,v 1.54 2000/05/09 17:40:14 davem Exp $
  *  linux/arch/sparc64/kernel/setup.c
  *
  *  Copyright (C) 1995,1996  David S. Miller (davem@caip.rutgers.edu)
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index 7bf31c104..12a872447 100644
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -1,4 +1,4 @@
-/* $Id: sparc64_ksyms.c,v 1.83 2000/04/19 08:38:25 davem Exp $
+/* $Id: sparc64_ksyms.c,v 1.84 2000/05/09 17:40:14 davem Exp $
  * arch/sparc64/kernel/sparc64_ksyms.c: Sparc64 specific ksyms support.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 657ceacaa..12592b747 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -1,4 +1,4 @@
-/* $Id: sys_sparc32.c,v 1.146 2000/05/09 04:48:34 davem Exp $
+/* $Id: sys_sparc32.c,v 1.147 2000/05/22 07:29:40 davem Exp $
  * sys_sparc32.c: Conversion between 32bit and 64bit native syscalls.
  *
  * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
@@ -1742,9 +1742,6 @@ static int copy_mount_stuff_to_kernel(const void *user, unsigned long *kernel)
 	return 0;
 }
 
-extern long do_sys_mount(char * dev_page, char * dir_page, char * type_page,
-			 unsigned long new_flags, char * data_page);
-
 #define SMBFS_NAME	"smbfs"
 #define NCPFS_NAME	"ncpfs"
 
@@ -1784,7 +1781,7 @@ asmlinkage int sys32_mount(char *dev_name, char *dir_name, char *type, unsigned
 		goto dev_out;
 
 	if (!is_smb && !is_ncp) {
-		err = do_sys_mount((char*)dev_page, (char*)dir_page,
+		err = do_mount((char*)dev_page, (char*)dir_page,
 				(char*)type_page, new_flags, (char*)data_page);
 	} else {
 		if (is_ncp)
@@ -1792,7 +1789,7 @@ asmlinkage int sys32_mount(char *dev_name, char *dir_name, char *type, unsigned
 		else
 			do_smb_super_data_conv((void *)data_page);
 
-		err = do_sys_mount((char*)dev_page, (char*)dir_page,
+		err = do_mount((char*)dev_page, (char*)dir_page,
 				(char*)type_page, new_flags, (char*)data_page);
 	}
 	free_page(dir_page);
diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c
index 8fbb16374..7aeb4781f 100644
--- a/arch/sparc64/kernel/sys_sunos32.c
+++ b/arch/sparc64/kernel/sys_sunos32.c
@@ -1,4 +1,4 @@
-/* $Id: sys_sunos32.c,v 1.46 2000/04/27 02:49:03 davem Exp $
+/* $Id: sys_sunos32.c,v 1.47 2000/05/22 07:29:40 davem Exp $
  * sys_sunos32.c: SunOS binary compatability layer on sparc64.
  *
  * Copyright (C) 1995, 1996, 1997 David S. Miller (davem@caip.rutgers.edu)
@@ -598,7 +598,6 @@ struct sunos_nfs_mount_args {
 	char       *netname;   /* server's netname */
 };
 
-extern long do_sys_mount(const char *, const char *, char *, int, void *);
 extern dev_t get_unnamed_dev(void);
 extern void put_unnamed_dev(dev_t);
 extern asmlinkage int sys_mount(char *, char *, char *, unsigned long, void *);
@@ -727,7 +726,7 @@ static int sunos_nfs_mount(char *dir_name, int linux_flags, void *data)
 	linux_nfs_mount.hostname [255] = 0;
 	putname (the_name);
 	
-	return do_sys_mount ("", dir_name, "nfs", linux_flags, &linux_nfs_mount);
+	return do_mount ("", dir_name, "nfs", linux_flags, &linux_nfs_mount);
 }
 
 /* XXXXXXXXXXXXXXXXXXXX */
@@ -787,7 +786,7 @@ sunos_mount(char *type, char *dir, int flags, void *data)
 	ret = PTR_ERR(dev_fname);
 	if (IS_ERR(dev_fname))
 		goto out2;
-	ret = do_sys_mount(dev_fname, dir_page, type_page, linux_flags, NULL);
+	ret = do_mount(dev_fname, dir_page, type_page, linux_flags, NULL);
 	if (dev_fname)
 		putname(dev_fname);
 out2:
diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
index eb02486f5..9c20a2752 100644
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
@@ -1,4 +1,4 @@
-/* $Id: systbls.S,v 1.72 2000/04/13 07:30:34 jj Exp $
+/* $Id: systbls.S,v 1.73 2000/05/10 14:23:39 jj Exp $
  * systbls.S: System call entry point tables for OS compatibility.
  *            The native Linux system call table lives here also.
  *
@@ -83,7 +83,7 @@ sys_call_table:
 /*10*/  .word sys_unlink, sunos_execv, sys_chdir, sys_chown, sys_mknod
 /*15*/	.word sys_chmod, sys_lchown, sparc_brk, sys_perfctr, sys_lseek
 /*20*/	.word sys_getpid, sys_capget, sys_capset, sys_setuid, sys_getuid
-/*25*/	.word sys_time, sys_ptrace, sys_alarm, sys_sigaltstack, sys_nis_syscall
+/*25*/	.word sys_nis_syscall, sys_ptrace, sys_alarm, sys_sigaltstack, sys_nis_syscall
 /*30*/	.word sys_utime, sys_nis_syscall, sys_nis_syscall, sys_access, sys_nice
 	.word sys_nis_syscall, sys_sync, sys_kill, sys_newstat, sys_sendfile
 /*40*/	.word sys_newlstat, sys_dup, sys_pipe, sys_times, sys_nis_syscall
@@ -124,7 +124,7 @@ sys_call_table:
 	.word sys_ipc, sys_nis_syscall, sys_clone, sys_nis_syscall, sys_adjtimex
 /*220*/	.word sys_nis_syscall, sys_create_module, sys_delete_module, sys_get_kernel_syms, sys_getpgid
 	.word sys_bdflush, sys_sysfs, sys_nis_syscall, sys_setfsuid, sys_setfsgid
-/*230*/	.word sys_select, sys_time, sys_nis_syscall, sys_stime, sys_nis_syscall
+/*230*/	.word sys_select, sys_nis_syscall, sys_nis_syscall, sys_stime, sys_nis_syscall
 	.word sys_nis_syscall, sys_llseek, sys_mlock, sys_munlock, sys_mlockall
 /*240*/	.word sys_munlockall, sys_sched_setparam, sys_sched_getparam, sys_sched_setscheduler, sys_sched_getscheduler
 	.word sys_sched_yield, sys_sched_get_priority_max, sys_sched_get_priority_min, sys_sched_rr_get_interval, sys_nanosleep
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index c630356e1..6a84d4c29 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -1,4 +1,4 @@
-/* $Id: time.c,v 1.25 2000/04/13 05:29:44 davem Exp $
+/* $Id: time.c,v 1.26 2000/05/09 17:40:14 davem Exp $
  * time.c: UltraSparc timer and TOD clock support.
  *
  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index cf20ffc1a..7b5d32614 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -1,4 +1,4 @@
-/* $Id: traps.c,v 1.65 2000/01/21 11:39:01 jj Exp $
+/* $Id: traps.c,v 1.66 2000/05/09 17:40:14 davem Exp $
  * arch/sparc64/kernel/traps.c
  *
  * Copyright (C) 1995,1997 David S. Miller (davem@caip.rutgers.edu)
diff --git a/arch/sparc64/kernel/ttable.S b/arch/sparc64/kernel/ttable.S
index 027d2e124..b1081b9fe 100644
--- a/arch/sparc64/kernel/ttable.S
+++ b/arch/sparc64/kernel/ttable.S
@@ -1,4 +1,4 @@
-/* $Id: ttable.S,v 1.30 1999/12/01 23:52:03 davem Exp $
+/* $Id: ttable.S,v 1.31 2000/05/09 17:40:14 davem Exp $
  * ttable.S: Sparc V9 Trap Table(s) with SpitFire extensions.
  *
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)