This commit fixes various 64bit portability problems required for

FreeBSD/alpha.  The most significant item is to change the command
argument to ioctl functions from int to u_long.  This change brings us
inline with various other BSD versions.  Driver writers may like to
use (__FreeBSD_version == 300003) to detect this change.

The prototype FreeBSD/alpha machdep will follow in a couple of days
time.

67 files changed, 522 insertions, 488 deletions

diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 73e43c0..89e127f 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.70 1998/03/30 09:47:57 phk Exp $
+ *	$Id: apm.c,v 1.71 1998/06/03 01:59:32 msmith Exp $
  */
 
 #include "opt_devfs.h"
@@ -917,7 +917,7 @@ apmclose(dev_t dev, int flag, int fmt, struct proc *p)
 }
 
 static int
-apmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
+apmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	struct apm_softc *sc = &apm_softc;
 	int error = 0;
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 73e43c0..89e127f 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.70 1998/03/30 09:47:57 phk Exp $
+ *	$Id: apm.c,v 1.71 1998/06/03 01:59:32 msmith Exp $
  */
 
 #include "opt_devfs.h"
@@ -917,7 +917,7 @@ apmclose(dev_t dev, int flag, int fmt, struct proc *p)
 }
 
 static int
-apmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
+apmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	struct apm_softc *sc = &apm_softc;
 	int error = 0;
diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c
index a90283a..fceb4dd 100644
--- a/sys/i386/i386/cons.c
+++ b/sys/i386/i386/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.56 1998/01/24 02:54:12 eivind Exp $
+ *	$Id: cons.c,v 1.57 1998/03/28 10:32:56 bde Exp $
  */
 
 #include "opt_devfs.h"
@@ -352,7 +352,7 @@ cnwrite(dev, uio, flag)
 static int
 cnioctl(dev, cmd, data, flag, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 	int flag;
 	struct proc *p;
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 513c97e..1889d0a 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_interface.c,v 1.37 1997/10/27 17:23:12 bde Exp $
+ *	$Id: db_interface.c,v 1.38 1997/11/20 18:09:36 bde Exp $
  */
 
 /*
@@ -213,7 +213,7 @@ kdb_trap(type, code, regs)
 void
 db_read_bytes(addr, size, data)
 	vm_offset_t	addr;
-	register int	size;
+	register size_t	size;
 	register char	*data;
 {
 	register char	*src;
@@ -233,7 +233,7 @@ db_read_bytes(addr, size, data)
 void
 db_write_bytes(addr, size, data)
 	vm_offset_t	addr;
-	register int	size;
+	register size_t	size;
 	register char	*data;
 {
 	register char	*dst;
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index 7dec82b..ed3ccd7 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trace.c,v 1.26 1997/10/27 17:23:18 bde Exp $
+ *	$Id: db_trace.c,v 1.27 1997/11/20 18:24:52 bde Exp $
  */
 
 #include <sys/param.h>
@@ -44,24 +44,24 @@
  * Machine register set.
  */
 struct db_variable db_regs[] = {
-	"cs",	(int *)&ddb_regs.tf_cs,  FCN_NULL,
-	"ds",	(int *)&ddb_regs.tf_ds,  FCN_NULL,
-	"es",	(int *)&ddb_regs.tf_es,  FCN_NULL,
+	"cs",	(long *)&ddb_regs.tf_cs,  FCN_NULL,
+	"ds",	(long *)&ddb_regs.tf_ds,  FCN_NULL,
+	"es",	(long *)&ddb_regs.tf_es,  FCN_NULL,
 #if 0
-	"fs",	(int *)&ddb_regs.tf_fs,  FCN_NULL,
-	"gs",	(int *)&ddb_regs.tf_gs,  FCN_NULL,
+	"fs",	(long *)&ddb_regs.tf_fs,  FCN_NULL,
+	"gs",	(long *)&ddb_regs.tf_gs,  FCN_NULL,
 #endif
-	"ss",	(int *)&ddb_regs.tf_ss,  FCN_NULL,
-	"eax",	(int *)&ddb_regs.tf_eax, FCN_NULL,
-	"ecx",	(int *)&ddb_regs.tf_ecx, FCN_NULL,
-	"edx",	(int *)&ddb_regs.tf_edx, FCN_NULL,
-	"ebx",	(int *)&ddb_regs.tf_ebx, FCN_NULL,
-	"esp",	(int *)&ddb_regs.tf_esp,FCN_NULL,
-	"ebp",	(int *)&ddb_regs.tf_ebp, FCN_NULL,
-	"esi",	(int *)&ddb_regs.tf_esi, FCN_NULL,
-	"edi",	(int *)&ddb_regs.tf_edi, FCN_NULL,
-	"eip",	(int *)&ddb_regs.tf_eip, FCN_NULL,
-	"efl",	(int *)&ddb_regs.tf_eflags, FCN_NULL,
+	"ss",	(long *)&ddb_regs.tf_ss,  FCN_NULL,
+	"eax",	(long *)&ddb_regs.tf_eax, FCN_NULL,
+	"ecx",	(long *)&ddb_regs.tf_ecx, FCN_NULL,
+	"edx",	(long *)&ddb_regs.tf_edx, FCN_NULL,
+	"ebx",	(long *)&ddb_regs.tf_ebx, FCN_NULL,
+	"esp",	(long *)&ddb_regs.tf_esp,FCN_NULL,
+	"ebp",	(long *)&ddb_regs.tf_ebp, FCN_NULL,
+	"esi",	(long *)&ddb_regs.tf_esi, FCN_NULL,
+	"edi",	(long *)&ddb_regs.tf_edi, FCN_NULL,
+	"eip",	(long *)&ddb_regs.tf_eip, FCN_NULL,
+	"efl",	(long *)&ddb_regs.tf_eflags, FCN_NULL,
 };
 struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
 
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index d57a2f0..331770d 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.297 1998/05/28 09:29:57 phk Exp $
+ *	$Id: machdep.c,v 1.298 1998/06/03 07:56:59 bde Exp $
  */
 
 #include "apm.h"
@@ -1614,7 +1614,7 @@ f00f_hack(void *unused) {
 int
 ptrace_set_pc(p, addr)
 	struct proc *p;
-	unsigned int addr;
+	unsigned long addr;
 {
 	p->p_md.md_regs->tf_eip = addr;
 	return (0);
@@ -1653,7 +1653,7 @@ int ptrace_read_u_check(p, addr, len)
 int ptrace_write_u(p, off, data)
 	struct proc *p;
 	vm_offset_t off;
-	int data;
+	long data;
 {
 	struct trapframe frame_copy;
 	vm_offset_t min;
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 14343de..8db7d3c 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.49 1998/01/24 02:54:13 eivind Exp $
+ *	$Id: mem.c,v 1.50 1998/03/12 09:14:18 bde Exp $
  */
 
 /*
@@ -405,7 +405,7 @@ memmmap(dev_t dev, int offset, int nprot)
 static int
 mmioctl(dev, cmd, cmdarg, flags, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t cmdarg;
 	int flags;
 	struct proc *p;
diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index 873ecc8..e285071 100644
--- a/sys/i386/ibcs2/ibcs2_ioctl.c
+++ b/sys/i386/ibcs2/ibcs2_ioctl.c
@@ -338,7 +338,7 @@ ibcs2_ioctl(p, uap)
 {
 	struct filedesc *fdp = p->p_fd;
 	struct file *fp;
-	int (*ctl) __P((struct file *, int, caddr_t, struct proc *));
+	int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *));
 	int error;
 
 	if (SCARG(uap, fd) < 0 || SCARG(uap, fd) >= fdp->fd_nfiles ||
diff --git a/sys/i386/ibcs2/ibcs2_isc_sysent.c b/sys/i386/ibcs2/ibcs2_isc_sysent.c
index 344dcab..51dab23 100644
--- a/sys/i386/ibcs2/ibcs2_isc_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_isc_sysent.c
@@ -5,6 +5,8 @@
  * created from	Id: syscalls.isc,v 1.4 1997/04/09 15:44:44 bde Exp 
  */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
diff --git a/sys/i386/ibcs2/ibcs2_proto.h b/sys/i386/ibcs2/ibcs2_proto.h
index 75ea03e..9f378dd 100644
--- a/sys/i386/ibcs2/ibcs2_proto.h
+++ b/sys/i386/ibcs2/ibcs2_proto.h
@@ -10,260 +10,265 @@
 
 #include <sys/signal.h>
 
+struct proc;
+
+#define PAD_(t) sizeof(register_t) <= sizeof(t) ? \
+		0 : sizeof(register_t) - sizeof(t)
+
 struct	ibcs2_read_args {
-	int fd;
-	char * buf;
-	u_int nbytes;
+	int fd;	char fd_[PAD_(int)];
+	char * buf;	char buf_[PAD_(char *)];
+	u_int nbytes;	char nbytes_[PAD_(u_int)];
 };
 struct	ibcs2_open_args {
-	char * path;
-	int flags;
-	int mode;
+	char * path;	char path_[PAD_(char *)];
+	int flags;	char flags_[PAD_(int)];
+	int mode;	char mode_[PAD_(int)];
 };
 struct	ibcs2_wait_args {
-	int a1;
-	int a2;
-	int a3;
+	int a1;	char a1_[PAD_(int)];
+	int a2;	char a2_[PAD_(int)];
+	int a3;	char a3_[PAD_(int)];
 };
 struct	ibcs2_creat_args {
-	char * path;
-	int mode;
+	char * path;	char path_[PAD_(char *)];
+	int mode;	char mode_[PAD_(int)];
 };
 struct	ibcs2_unlink_args {
-	char * path;
+	char * path;	char path_[PAD_(char *)];
 };
 struct	ibcs2_execv_args {
-	char * path;
-	char ** argp;
+	char * path;	char path_[PAD_(char *)];
+	char ** argp;	char argp_[PAD_(char **)];
 };
 struct	ibcs2_chdir_args {
-	char * path;
+	char * path;	char path_[PAD_(char *)];
 };
 struct	ibcs2_time_args {
-	ibcs2_time_t * tp;
+	ibcs2_time_t * tp;	char tp_[PAD_(ibcs2_time_t *)];
 };
 struct	ibcs2_mknod_args {
-	char * path;
-	int mode;
-	int dev;
+	char * path;	char path_[PAD_(char *)];
+	int mode;	char mode_[PAD_(int)];
+	int dev;	char dev_[PAD_(int)];
 };
 struct	ibcs2_chmod_args {
-	char * path;
-	int mode;
+	char * path;	char path_[PAD_(char *)];
+	int mode;	char mode_[PAD_(int)];
 };
 struct	ibcs2_chown_args {
-	char * path;
-	int uid;
-	int gid;
+	char * path;	char path_[PAD_(char *)];
+	int uid;	char uid_[PAD_(int)];
+	int gid;	char gid_[PAD_(int)];
 };
 struct	ibcs2_stat_args {
-	char * path;
-	struct ibcs2_stat * st;
+	char * path;	char path_[PAD_(char *)];
+	struct ibcs2_stat * st;	char st_[PAD_(struct ibcs2_stat *)];
 };
 struct	ibcs2_lseek_args {
-	int fd;
-	long offset;
-	int whence;
+	int fd;	char fd_[PAD_(int)];
+	long offset;	char offset_[PAD_(long)];
+	int whence;	char whence_[PAD_(int)];
 };
 struct	ibcs2_mount_args {
-	char * special;
-	char * dir;
-	int flags;
-	int fstype;
-	char * data;
-	int len;
+	char * special;	char special_[PAD_(char *)];
+	char * dir;	char dir_[PAD_(char *)];
+	int flags;	char flags_[PAD_(int)];
+	int fstype;	char fstype_[PAD_(int)];
+	char * data;	char data_[PAD_(char *)];
+	int len;	char len_[PAD_(int)];
 };
 struct	ibcs2_umount_args {
-	char * name;
+	char * name;	char name_[PAD_(char *)];
 };
 struct	ibcs2_setuid_args {
-	int uid;
+	int uid;	char uid_[PAD_(int)];
 };
 struct	ibcs2_stime_args {
-	long * timep;
+	long * timep;	char timep_[PAD_(long *)];
 };
 struct	ibcs2_alarm_args {
-	unsigned sec;
+	unsigned sec;	char sec_[PAD_(unsigned)];
 };
 struct	ibcs2_fstat_args {
-	int fd;
-	struct ibcs2_stat * st;
+	int fd;	char fd_[PAD_(int)];
+	struct ibcs2_stat * st;	char st_[PAD_(struct ibcs2_stat *)];
 };
 struct	ibcs2_pause_args {
-	int dummy;
+	register_t dummy;
 };
 struct	ibcs2_utime_args {
-	char * path;
-	struct ibcs2_utimbuf * buf;
+	char * path;	char path_[PAD_(char *)];
+	struct ibcs2_utimbuf * buf;	char buf_[PAD_(struct ibcs2_utimbuf *)];
 };
 struct	ibcs2_stty_args {
-	int fd;
-	struct sgttyb * buf;
+	int fd;	char fd_[PAD_(int)];
+	struct sgttyb * buf;	char buf_[PAD_(struct sgttyb *)];
 };
 struct	ibcs2_gtty_args {
-	int fd;
-	struct sgttyb * buf;
+	int fd;	char fd_[PAD_(int)];
+	struct sgttyb * buf;	char buf_[PAD_(struct sgttyb *)];
 };
 struct	ibcs2_access_args {
-	char * path;
-	int flags;
+	char * path;	char path_[PAD_(char *)];
+	int flags;	char flags_[PAD_(int)];
 };
 struct	ibcs2_nice_args {
-	int incr;
+	int incr;	char incr_[PAD_(int)];
 };
 struct	ibcs2_statfs_args {
-	char * path;
-	struct ibcs2_statfs * buf;
-	int len;
-	int fstype;
+	char * path;	char path_[PAD_(char *)];
+	struct ibcs2_statfs * buf;	char buf_[PAD_(struct ibcs2_statfs *)];
+	int len;	char len_[PAD_(int)];
+	int fstype;	char fstype_[PAD_(int)];
 };
 struct	ibcs2_kill_args {
-	int pid;
-	int signo;
+	int pid;	char pid_[PAD_(int)];
+	int signo;	char signo_[PAD_(int)];
 };
 struct	ibcs2_fstatfs_args {
-	int fd;
-	struct ibcs2_statfs * buf;
-	int len;
-	int fstype;
+	int fd;	char fd_[PAD_(int)];
+	struct ibcs2_statfs * buf;	char buf_[PAD_(struct ibcs2_statfs *)];
+	int len;	char len_[PAD_(int)];
+	int fstype;	char fstype_[PAD_(int)];
 };
 struct	ibcs2_pgrpsys_args {
-	int type;
-	caddr_t dummy;
-	int pid;
-	int pgid;
+	int type;	char type_[PAD_(int)];
+	caddr_t dummy;	char dummy_[PAD_(caddr_t)];
+	int pid;	char pid_[PAD_(int)];
+	int pgid;	char pgid_[PAD_(int)];
 };
 struct	ibcs2_xenix_args {
-	int a1;
-	int a2;
-	int a3;
-	int a4;
-	int a5;
+	int a1;	char a1_[PAD_(int)];
+	int a2;	char a2_[PAD_(int)];
+	int a3;	char a3_[PAD_(int)];
+	int a4;	char a4_[PAD_(int)];
+	int a5;	char a5_[PAD_(int)];
 };
 struct	ibcs2_times_args {
-	struct tms * tp;
+	struct tms * tp;	char tp_[PAD_(struct tms *)];
 };
 struct	ibcs2_plock_args {
-	int cmd;
+	int cmd;	char cmd_[PAD_(int)];
 };
 struct	ibcs2_setgid_args {
-	int gid;
+	int gid;	char gid_[PAD_(int)];
 };
 struct	ibcs2_sigsys_args {
-	int sig;
-	ibcs2_sig_t fp;
+	int sig;	char sig_[PAD_(int)];
+	ibcs2_sig_t fp;	char fp_[PAD_(ibcs2_sig_t)];
 };
 struct	ibcs2_msgsys_args {
-	int which;
-	int a2;
-	int a3;
-	int a4;
-	int a5;
-	int a6;
+	int which;	char which_[PAD_(int)];
+	int a2;	char a2_[PAD_(int)];
+	int a3;	char a3_[PAD_(int)];
+	int a4;	char a4_[PAD_(int)];
+	int a5;	char a5_[PAD_(int)];
+	int a6;	char a6_[PAD_(int)];
 };
 struct	ibcs2_sysi86_args {
-	int cmd;
-	int * arg;
+	int cmd;	char cmd_[PAD_(int)];
+	int * arg;	char arg_[PAD_(int *)];
 };
 struct	ibcs2_shmsys_args {
-	int which;
-	int a2;
-	int a3;
-	int a4;
+	int which;	char which_[PAD_(int)];
+	int a2;	char a2_[PAD_(int)];
+	int a3;	char a3_[PAD_(int)];
+	int a4;	char a4_[PAD_(int)];
 };
 struct	ibcs2_semsys_args {
-	int which;
-	int a2;
-	int a3;
-	int a4;
-	int a5;
+	int which;	char which_[PAD_(int)];
+	int a2;	char a2_[PAD_(int)];
+	int a3;	char a3_[PAD_(int)];
+	int a4;	char a4_[PAD_(int)];
+	int a5;	char a5_[PAD_(int)];
 };
 struct	ibcs2_ioctl_args {
-	int fd;
-	int cmd;
-	caddr_t data;
+	int fd;	char fd_[PAD_(int)];
+	int cmd;	char cmd_[PAD_(int)];
+	caddr_t data;	char data_[PAD_(caddr_t)];
 };
 struct	ibcs2_uadmin_args {
-	int cmd;
-	int func;
-	caddr_t data;
+	int cmd;	char cmd_[PAD_(int)];
+	int func;	char func_[PAD_(int)];
+	caddr_t data;	char data_[PAD_(caddr_t)];
 };
 struct	ibcs2_utssys_args {
-	int a1;
-	int a2;
-	int flag;
+	int a1;	char a1_[PAD_(int)];
+	int a2;	char a2_[PAD_(int)];
+	int flag;	char flag_[PAD_(int)];
 };
 struct	ibcs2_execve_args {
-	char * path;
-	char ** argp;
-	char ** envp;
+	char * path;	char path_[PAD_(char *)];
+	char ** argp;	char argp_[PAD_(char **)];
+	char ** envp;	char envp_[PAD_(char **)];
 };
 struct	ibcs2_fcntl_args {
-	int fd;
-	int cmd;
-	char * arg;
+	int fd;	char fd_[PAD_(int)];
+	int cmd;	char cmd_[PAD_(int)];
+	char * arg;	char arg_[PAD_(char *)];
 };
 struct	ibcs2_ulimit_args {
-	int cmd;
-	int newlimit;
+	int cmd;	char cmd_[PAD_(int)];
+	int newlimit;	char newlimit_[PAD_(int)];
 };
 struct	ibcs2_rmdir_args {
-	char * path;
+	char * path;	char path_[PAD_(char *)];
 };
 struct	ibcs2_mkdir_args {
-	char * path;
-	int mode;
+	char * path;	char path_[PAD_(char *)];
+	int mode;	char mode_[PAD_(int)];
 };
 struct	ibcs2_getdents_args {
-	int fd;
-	char * buf;
-	int nbytes;
+	int fd;	char fd_[PAD_(int)];
+	char * buf;	char buf_[PAD_(char *)];
+	int nbytes;	char nbytes_[PAD_(int)];
 };
 struct	ibcs2_sysfs_args {
-	int cmd;
-	caddr_t d1;
-	char * buf;
+	int cmd;	char cmd_[PAD_(int)];
+	caddr_t d1;	char d1_[PAD_(caddr_t)];
+	char * buf;	char buf_[PAD_(char *)];
 };
 struct	ibcs2_getmsg_args {
-	int fd;
-	struct ibcs2_stropts * ctl;
-	struct ibcs2_stropts * dat;
-	int * flags;
+	int fd;	char fd_[PAD_(int)];
+	struct ibcs2_stropts * ctl;	char ctl_[PAD_(struct ibcs2_stropts *)];
+	struct ibcs2_stropts * dat;	char dat_[PAD_(struct ibcs2_stropts *)];
+	int * flags;	char flags_[PAD_(int *)];
 };
 struct	ibcs2_putmsg_args {
-	int fd;
-	struct ibcs2_stropts * ctl;
-	struct ibcs2_stropts * dat;
-	int flags;
+	int fd;	char fd_[PAD_(int)];
+	struct ibcs2_stropts * ctl;	char ctl_[PAD_(struct ibcs2_stropts *)];
+	struct ibcs2_stropts * dat;	char dat_[PAD_(struct ibcs2_stropts *)];
+	int flags;	char flags_[PAD_(int)];
 };
 struct	ibcs2_poll_args {
-	struct ibcs2_poll * fds;
-	long nfds;
-	int timeout;
+	struct ibcs2_poll * fds;	char fds_[PAD_(struct ibcs2_poll *)];
+	long nfds;	char nfds_[PAD_(long)];
+	int timeout;	char timeout_[PAD_(int)];
 };
 struct	ibcs2_secure_args {
-	int cmd;
-	int a1;
-	int a2;
-	int a3;
-	int a4;
-	int a5;
+	int cmd;	char cmd_[PAD_(int)];
+	int a1;	char a1_[PAD_(int)];
+	int a2;	char a2_[PAD_(int)];
+	int a3;	char a3_[PAD_(int)];
+	int a4;	char a4_[PAD_(int)];
+	int a5;	char a5_[PAD_(int)];
 };
 struct	ibcs2_symlink_args {
-	char * path;
-	char * link;
+	char * path;	char path_[PAD_(char *)];
+	char * link;	char link_[PAD_(char *)];
 };
 struct	ibcs2_lstat_args {
-	char * path;
-	struct ibcs2_stat * st;
+	char * path;	char path_[PAD_(char *)];
+	struct ibcs2_stat * st;	char st_[PAD_(struct ibcs2_stat *)];
 };
 struct	ibcs2_readlink_args {
-	char * path;
-	char * buf;
-	int count;
+	char * path;	char path_[PAD_(char *)];
+	char * buf;	char buf_[PAD_(char *)];
+	int count;	char count_[PAD_(int)];
 };
 struct	ibcs2_isc_args {
-	int dummy;
+	register_t dummy;
 };
 int	ibcs2_read __P((struct proc *, struct ibcs2_read_args *));
 int	ibcs2_open __P((struct proc *, struct ibcs2_open_args *));
@@ -327,4 +332,6 @@ int	ibcs2_isc __P((struct proc *, struct ibcs2_isc_args *));
 
 #endif /* COMPAT_43 */
 
+#undef PAD_
+
 #endif /* !_IBCS2_SYSPROTO_H_ */
diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c
index f011ec6..175b734 100644
--- a/sys/i386/ibcs2/ibcs2_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_sysent.c
@@ -5,6 +5,8 @@
  * created from	Id: syscalls.master,v 1.8 1997/04/09 15:44:46 bde Exp 
  */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
diff --git a/sys/i386/ibcs2/ibcs2_xenix.h b/sys/i386/ibcs2/ibcs2_xenix.h
index df0568e..f83f268 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.h
+++ b/sys/i386/ibcs2/ibcs2_xenix.h
@@ -10,67 +10,72 @@
 
 #include <sys/signal.h>
 
+struct proc;
+
+#define PAD_(t) sizeof(register_t) <= sizeof(t) ? \
+		0 : sizeof(register_t) - sizeof(t)
+
 struct	xenix_rdchk_args {
-	int fd;
+	int fd;	char fd_[PAD_(int)];
 };
 struct	xenix_chsize_args {
-	int fd;
-	long size;
+	int fd;	char fd_[PAD_(int)];
+	long size;	char size_[PAD_(long)];
 };
 struct	xenix_ftime_args {
-	struct timeb * tp;
+	struct timeb * tp;	char tp_[PAD_(struct timeb *)];
 };
 struct	xenix_nap_args {
-	int millisec;
+	int millisec;	char millisec_[PAD_(int)];
 };
 struct	xenix_scoinfo_args {
-	int dummy;
+	register_t dummy;
 };
 struct	xenix_eaccess_args {
-	char * path;
-	int flags;
+	char * path;	char path_[PAD_(char *)];
+	int flags;	char flags_[PAD_(int)];
 };
 struct	ibcs2_sigaction_args {
-	int sig;
-	struct ibcs2_sigaction * act;
-	struct ibcs2_sigaction * oact;
+	int sig;	char sig_[PAD_(int)];
+	struct ibcs2_sigaction * act;	char act_[PAD_(struct ibcs2_sigaction *)];
+	struct ibcs2_sigaction * oact;	char oact_[PAD_(struct ibcs2_sigaction *)];
 };
 struct	ibcs2_sigprocmask_args {
-	int how;
-	ibcs2_sigset_t * set;
-	ibcs2_sigset_t * oset;
+	int how;	char how_[PAD_(int)];
+	ibcs2_sigset_t * set;	char set_[PAD_(ibcs2_sigset_t *)];
+	ibcs2_sigset_t * oset;	char oset_[PAD_(ibcs2_sigset_t *)];
 };
 struct	ibcs2_sigpending_args {
-	ibcs2_sigset_t * mask;
+	ibcs2_sigset_t * mask;	char mask_[PAD_(ibcs2_sigset_t *)];
 };
 struct	ibcs2_sigsuspend_args {
-	ibcs2_sigset_t * mask;
+	ibcs2_sigset_t * mask;	char mask_[PAD_(ibcs2_sigset_t *)];
 };
 struct	ibcs2_getgroups_args {
-	int gidsetsize;
-	ibcs2_gid_t * gidset;
+	int gidsetsize;	char gidsetsize_[PAD_(int)];
+	ibcs2_gid_t * gidset;	char gidset_[PAD_(ibcs2_gid_t *)];
 };
 struct	ibcs2_setgroups_args {
-	int gidsetsize;
-	ibcs2_gid_t * gidset;
+	int gidsetsize;	char gidsetsize_[PAD_(int)];
+	ibcs2_gid_t * gidset;	char gidset_[PAD_(ibcs2_gid_t *)];
 };
 struct	ibcs2_sysconf_args {
-	int name;
+	int name;	char name_[PAD_(int)];
 };
 struct	ibcs2_pathconf_args {
-	char * path;
-	int name;
+	char * path;	char path_[PAD_(char *)];
+	int name;	char name_[PAD_(int)];
 };
 struct	ibcs2_fpathconf_args {
-	int fd;
-	int name;
+	int fd;	char fd_[PAD_(int)];
+	int name;	char name_[PAD_(int)];
 };
 struct	ibcs2_rename_args {
-	char * from;
-	char * to;
+	char * from;	char from_[PAD_(char *)];
+	char * to;	char to_[PAD_(char *)];
 };
 struct	xenix_utsname_args {
-	long addr;
+	long addr;	char addr_[PAD_(long)];
 };
 int	xenix_rdchk __P((struct proc *, struct xenix_rdchk_args *));
 int	xenix_chsize __P((struct proc *, struct xenix_chsize_args *));
@@ -90,4 +95,11 @@ int	ibcs2_fpathconf __P((struct proc *, struct ibcs2_fpathconf_args *));
 int	ibcs2_rename __P((struct proc *, struct ibcs2_rename_args *));
 int	xenix_utsname __P((struct proc *, struct xenix_utsname_args *));
 
+#ifdef COMPAT_43
+
+
+#endif /* COMPAT_43 */
+
+#undef PAD_
+
 #endif /* !_IBCS2_XENIX_H_ */
diff --git a/sys/i386/ibcs2/ibcs2_xenix_sysent.c b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
index c8804fe..eb81543 100644
--- a/sys/i386/ibcs2/ibcs2_xenix_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
@@ -5,6 +5,8 @@
  * created from	Id: syscalls.xenix,v 1.5 1997/04/09 15:44:47 bde Exp 
  */
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
diff --git a/sys/i386/ibcs2/syscalls.conf b/sys/i386/ibcs2/syscalls.conf
index 4474f6e..ebdaa97 100644
--- a/sys/i386/ibcs2/syscalls.conf
+++ b/sys/i386/ibcs2/syscalls.conf
@@ -1,8 +1,9 @@
-#	syscalls.conf  $Id$
+#	syscalls.conf  $Id: syscalls.conf,v 1.4 1997/02/22 09:33:32 peter Exp $
 sysnames="/dev/null"
 sysproto="ibcs2_proto.h"
 sysproto_h=_IBCS2_SYSPROTO_H_
 syshdr="ibcs2_syscall.h"
+sysmk="/dev/null"
 syssw="ibcs2_sysent.c"
 syshide="/dev/null"
 syscallprefix="IBCS2_SYS_"
diff --git a/sys/i386/ibcs2/syscalls.isc.conf b/sys/i386/ibcs2/syscalls.isc.conf
index fc52716..90e30ff 100644
--- a/sys/i386/ibcs2/syscalls.isc.conf
+++ b/sys/i386/ibcs2/syscalls.isc.conf
@@ -1,9 +1,10 @@
-#	syscalls.conf  $Id$
+#	syscalls.conf  $Id: syscalls.isc.conf,v 1.3 1997/02/22 09:33:37 peter Exp $
 sysnames="/dev/null"
 #sysproto="ibcs2_isc.h"
 sysproto="/dev/null"
 sysproto_h=_IBCS2_ISC_H_
 syshdr="ibcs2_isc_syscall.h"
+sysmk="/dev/null"
 syssw="ibcs2_isc_sysent.c"
 syshide="/dev/null"
 syscallprefix="IBCS2_ISC_"
diff --git a/sys/i386/ibcs2/syscalls.xenix.conf b/sys/i386/ibcs2/syscalls.xenix.conf
index 742080e..4b4af8b 100644
--- a/sys/i386/ibcs2/syscalls.xenix.conf
+++ b/sys/i386/ibcs2/syscalls.xenix.conf
@@ -1,8 +1,9 @@
-#	syscalls.conf  $Id$
+#	syscalls.conf  $Id: syscalls.xenix.conf,v 1.3 1997/02/22 09:33:40 peter Exp $
 sysnames="/dev/null"
 sysproto="ibcs2_xenix.h"
 sysproto_h=_IBCS2_XENIX_H_
 syshdr="ibcs2_xenix_syscall.h"
+sysmk="/dev/null"
 syssw="ibcs2_xenix_sysent.c"
 syshide="/dev/null"
 syscallprefix="IBCS2_XENIX_"
diff --git a/sys/i386/isa/alog.c b/sys/i386/isa/alog.c
index eeb6c96..8fbe576 100644
--- a/sys/i386/isa/alog.c
+++ b/sys/i386/isa/alog.c
@@ -193,7 +193,7 @@ static int sync_clock2 (int unit, long period); /* setup clock 2 period */
 static int putfifo (talog_chan *pchan, u_short fifoent);
 static int alog_open (dev_t dev, int oflags, int devtype, struct proc *p);
 static int alog_close (dev_t dev, int fflag, int devtype, struct proc *p);
-static int alog_ioctl (dev_t dev, int cmd, caddr_t data,
+static int alog_ioctl (dev_t dev, u_long cmd, caddr_t data,
 		        int fflag, struct proc *p);
 static int alog_read (dev_t dev, struct uio *uio, int ioflag);
 static int alog_poll (dev_t dev, int events, struct proc *p);
@@ -215,7 +215,7 @@ struct isa_driver alogdriver = { alog_probe, alog_attach, "alog", 0 };
 
 
 /* handle the ioctls */
-static int alog_ioctl (dev_t dev, int cmd, caddr_t data,
+static int alog_ioctl (dev_t dev, u_long cmd, caddr_t data,
 		        int fflag, struct proc *p)
 {
   int unit = UNIT(dev);
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index cd40df4..7f788d7 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $Id: asc.c,v 1.28 1998/01/24 02:54:15 eivind Exp $
+ * $Id: asc.c,v 1.29 1998/03/28 10:32:59 bde Exp $
  */
 
 #include "asc.h"
@@ -831,7 +831,7 @@ ascread(dev_t dev, struct uio *uio, int ioflag)
  ***/
 
 STATIC int
-ascioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
+ascioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
   int unit = UNIT(minor(dev));
   struct asc_unit *scu = unittab + unit;
diff --git a/sys/i386/isa/b004.c b/sys/i386/isa/b004.c
index 7cacaf1..5a9357d 100644
--- a/sys/i386/isa/b004.c
+++ b/sys/i386/isa/b004.c
@@ -487,7 +487,7 @@ bqupoll(dev_t dev, int events, struct proc *p)
  */
 
 static int
-bquioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
+bquioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
     unsigned int dev_min = minor(dev) & 7;
     int result = 0;
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 92b48b8..c16e636 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id: ctx.c,v 1.25 1997/07/20 14:09:52 bde Exp $
+ *	$Id: ctx.c,v 1.26 1998/01/24 02:54:17 eivind Exp $
  */
 
 /*
@@ -360,7 +360,7 @@ ctxread(dev_t dev, struct uio * uio, int ioflag)
 }
 
 static int
-ctxioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
+ctxioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
 	int     error;
 	int     unit, i;
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index d40f3e7..4a8d144 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -295,7 +295,7 @@ int cxwrite (dev_t dev, struct uio *uio, int flag)
 	return ((*linesw[tp->t_line].l_write) (tp, uio, flag));
 }
 
-int cxioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+int cxioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	int unit = UNIT (dev);
 	cx_chan_t *c, *m;
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 5dd4762..04a0a1c 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.61 1998/02/13 12:45:47 phk Exp $
+ *	$Id: cy.c,v 1.62 1998/03/18 20:52:28 dg Exp $
  */
 
 #include "opt_compat.h"
@@ -1383,7 +1383,7 @@ siointr1(com)
 static int
 sioioctl(dev, cmd, data, flag, p)
 	dev_t		dev;
-	int		cmd;
+	u_long		cmd;
 	caddr_t		data;
 	int		flag;
 	struct proc	*p;
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 5445b3f..5a9d93c 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.111 1998/05/06 22:14:41 julian Exp $
+ *	$Id: fd.c,v 1.112 1998/05/06 23:35:36 julian Exp $
  *
  */
 
@@ -2040,7 +2040,7 @@ fdformat(dev, finfo, p)
 static int
 fdioctl(dev, cmd, addr, flag, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t addr;
 	int flag;
 	struct proc *p;
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 61f651b7..b03b712 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -387,7 +387,7 @@ gpwrite(dev, uio, ioflag)
    write to using a minor device = its GPIB address */
 
 static	int
-gpioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
+gpioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
 	struct gpibdata *gd = (struct gpibdata *)data;
 	int	error,result;
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index 966249f..44a97ea 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -742,7 +742,7 @@ gscread  (dev_t dev, struct uio *uio, int ioflag)
  */
 
 static	int
-gscioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+gscioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
   int unit = UNIT(minor(dev));
   struct gsc_unit *scu = unittab + unit;
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index 53c4b20..72704e1 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.17 1998/01/08 23:40:37 eivind Exp $
+ * $Id: if_ar.c,v 1.18 1998/04/17 22:36:33 des Exp $
  */
 
 /*
@@ -181,7 +181,7 @@ struct isa_driver ardriver = {arprobe, arattach, "arc"};
 
 static void ar_xmit(struct ar_softc *sc);
 static void arstart(struct ifnet *ifp);
-static int arioctl(struct ifnet *ifp, int cmd, caddr_t data);
+static int arioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
 static void arwatchdog(struct ifnet *ifp);
 static int ar_packet_avail(struct ar_softc *sc, int *len, u_char *rxstat);
 static void ar_copy_rxbuf(struct mbuf *m, struct ar_softc *sc, int len);
@@ -597,7 +597,7 @@ top_arstart:
 }
 
 static int
-arioctl(struct ifnet *ifp, int cmd, caddr_t data)
+arioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	int s, error;
 	int was_up, should_be_up;
diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index 01f58f7..ded05ec 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -83,7 +83,7 @@ static int cxtinth __P((cx_chan_t *c));
 #define IFSTRUCTSZ   (sizeof (struct sppp))
 #define IFNETSZ         (sizeof (struct ifnet))
 
-static int cxsioctl (struct ifnet *ifp, int cmd, caddr_t data);
+static int cxsioctl (struct ifnet *ifp, u_long cmd, caddr_t data);
 static void cxstart (struct ifnet *ifp);
 static void cxwatchdog (struct ifnet *ifp);
 static void cxinput (cx_chan_t *c, void *buf, unsigned len);
@@ -316,7 +316,7 @@ struct isa_driver cxdriver = { cxprobe, cxattach, "cx" };
  * Process an ioctl request.
  */
 static int
-cxsioctl (struct ifnet *ifp, int cmd, caddr_t data)
+cxsioctl (struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	cx_chan_t *q, *c = ifp->if_softc;
 	int error, s, was_up, should_be_up;
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 3e15d49..d670bf2 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.139 1998/04/15 17:45:15 bde Exp $
+ *	$Id: if_ed.c,v 1.140 1998/04/17 22:36:34 des Exp $
  */
 
 /*
@@ -139,7 +139,7 @@ static int ed_attach		__P((struct ed_softc *, int, int));
 static int ed_attach_isa	__P((struct isa_device *));
 
 static void ed_init		__P((void *));
-static int ed_ioctl		__P((struct ifnet *, int, caddr_t));
+static int ed_ioctl		__P((struct ifnet *, u_long, caddr_t));
 static int ed_probe		__P((struct isa_device *));
 static void ed_start		__P((struct ifnet *));
 static void ed_reset		__P((struct ifnet *));
@@ -2582,7 +2582,7 @@ edintr(unit)
 static int
 ed_ioctl(ifp, command, data)
 	register struct ifnet *ifp;
-	int     command;
+	u_long     command;
 	caddr_t data;
 {
 	struct ed_softc *sc = ifp->if_softc;
diff --git a/sys/i386/isa/if_eg.c b/sys/i386/isa/if_eg.c
index 7500016..7f68aa6 100644
--- a/sys/i386/isa/if_eg.c
+++ b/sys/i386/isa/if_eg.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_eg.c,v 1.26 1998/01/08 23:40:47 eivind Exp $
+ * $Id: if_eg.c,v 1.27 1998/03/28 13:23:56 bde Exp $
  *
  * Support for 3Com 3c505 Etherlink+ card.
  */
@@ -104,7 +104,7 @@ static int egreadPCBready __P((struct eg_softc *sc));
 static int egwritePCB __P((struct eg_softc *sc));
 static int egreadPCB __P((struct eg_softc *sc));
 static void eginit __P((struct eg_softc *sc));
-static int egioctl (struct ifnet *, int, caddr_t);
+static int egioctl (struct ifnet *, u_long, caddr_t);
 static void egrecv(struct eg_softc *);
 static void egstart(struct ifnet *);
 static void egread __P((struct eg_softc *, caddr_t, int));
@@ -699,7 +699,7 @@ egget(sc, buf, totlen)
 static int
 egioctl(ifp, command, data)
 	register struct ifnet *ifp;
-	int command;
+	u_long command;
 	caddr_t data;
 {
 	struct eg_softc *sc = ifp->if_softc;
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 2faef84..1fe6064 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
- * $Id: if_el.c,v 1.34 1998/03/28 13:23:58 bde Exp $
+ * $Id: if_el.c,v 1.35 1998/04/15 17:45:18 bde Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -75,7 +75,7 @@ static struct el_softc {
 /* Prototypes */
 static int el_attach(struct isa_device *);
 static void el_init(int);
-static int el_ioctl(struct ifnet *,int,caddr_t);
+static int el_ioctl(struct ifnet *,u_long,caddr_t);
 static int el_probe(struct isa_device *);
 static void el_start(struct ifnet *);
 static void el_reset(int);
@@ -645,7 +645,7 @@ elget(buf, totlen, off0, ifp)
 static int
 el_ioctl(ifp, command, data)
 	register struct ifnet *ifp;
-	int command;
+	u_long command;
 	caddr_t data;
 {
 	register struct ifaddr *ifa = (struct ifaddr *)data;
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 6e96c8f..9087bb5 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.73 1998/02/27 05:38:30 msmith Exp $
+ *  $Id: if_ep.c,v 1.74 1998/03/28 13:24:01 bde Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -116,7 +116,7 @@ static	int eeprom_rdy __P((struct ep_softc *sc));
 static	int ep_isa_probe __P((struct isa_device *));
 static struct ep_board * ep_look_for_board_at __P((struct isa_device *is));
 static	int ep_isa_attach __P((struct isa_device *));
-static	int epioctl __P((struct ifnet * ifp, int, caddr_t));
+static	int epioctl __P((struct ifnet * ifp, u_long, caddr_t));
 
 static	void epinit __P((struct ep_softc *));
 static	void epread __P((struct ep_softc *));
@@ -1197,7 +1197,7 @@ out:
 static int
 epioctl(ifp, cmd, data)
     register struct ifnet *ifp;
-    int cmd;
+    u_long cmd;
     caddr_t data;
 {
     register struct ifaddr *ifa = (struct ifaddr *) data;
diff --git a/sys/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c
index 1f58a06..f64ef74 100644
--- a/sys/i386/isa/if_ex.c
+++ b/sys/i386/isa/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.10 1998/01/08 23:40:52 eivind Exp $
+ *	$Id: if_ex.c,v 1.11 1998/03/28 13:24:06 bde Exp $
  */
 
 /*
@@ -119,7 +119,7 @@ static int ex_attach __P((struct isa_device *));
 static void ex_init __P((void *));
 static void ex_start __P((struct ifnet *));
 static void ex_stop __P((int));
-static int ex_ioctl __P((struct ifnet *, int, caddr_t));
+static int ex_ioctl __P((struct ifnet *, u_long, caddr_t));
 static void ex_reset __P((int));
 static void ex_watchdog __P((struct ifnet *));
 
@@ -760,7 +760,7 @@ void ex_rx_intr(int unit)
 }
 
 
-int ex_ioctl(register struct ifnet *ifp, int cmd, caddr_t data)
+int ex_ioctl(register struct ifnet *ifp, u_long cmd, caddr_t data)
 {
   register struct ifaddr *ifa = (struct ifaddr *) data;
   struct ex_softc *sc = &ex_sc[ifp->if_unit];
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 81a4b72..8fae123 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.39 1998/02/27 06:39:31 msmith Exp $
+ * $Id: if_fe.c,v 1.40 1998/03/28 13:24:09 bde Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -239,7 +239,7 @@ static struct fe_softc {
 static int		fe_probe	( struct isa_device * );
 static int		fe_attach	( struct isa_device * );
 static void		fe_init		( int );
-static int		fe_ioctl	( struct ifnet *, int, caddr_t );
+static int		fe_ioctl	( struct ifnet *, u_long, caddr_t );
 static void		fe_start	( struct ifnet * );
 static void		fe_reset	( int );
 static void		fe_watchdog	( struct ifnet * );
@@ -2471,7 +2471,7 @@ feintr ( int unit )
  * pretty ugly.
  */
 static int
-fe_ioctl ( struct ifnet * ifp, int command, caddr_t data )
+fe_ioctl ( struct ifnet * ifp, u_long command, caddr_t data )
 {
 	struct fe_softc *sc = ifp->if_softc;
 	int s, error = 0;
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index a34f11d..0e96d6f 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.51 1998/03/28 13:24:13 bde Exp $
+ *	$Id: if_ie.c,v 1.52 1998/04/15 17:45:20 bde Exp $
  */
 
 /*
@@ -184,7 +184,7 @@ static int	ee16_probe(struct isa_device * dvp);
 static int	check_ie_present(int unit, caddr_t where, unsigned size);
 static void	ieinit(int unit);
 static void	ie_stop(int unit);
-static int	ieioctl(struct ifnet * ifp, int command, caddr_t data);
+static int	ieioctl(struct ifnet * ifp, u_long command, caddr_t data);
 static void	iestart(struct ifnet * ifp);
 
 static void	el_reset_586(int unit);
@@ -2251,7 +2251,7 @@ ie_stop(int unit)
 }
 
 static int
-ieioctl(struct ifnet *ifp, int command, caddr_t data)
+ieioctl(struct ifnet *ifp, u_long command, caddr_t data)
 {
 	struct ifaddr *ifa = (struct ifaddr *) data;
 	struct ie_softc *ie = ifp->if_softc;
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 3481903..67e175e 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_le.c,v 1.43 1998/01/08 23:40:58 eivind Exp $
+ * $Id: if_le.c,v 1.44 1998/03/28 13:24:17 bde Exp $
  */
 
 /*
@@ -241,7 +241,7 @@ struct le_softc {
 
 static int le_probe(struct isa_device *dvp);
 static int le_attach(struct isa_device *dvp);
-static int le_ioctl(struct ifnet *ifp, int command, caddr_t data);
+static int le_ioctl(struct ifnet *ifp, u_long command, caddr_t data);
 static void le_input(le_softc_t *sc, caddr_t seg1, size_t total_len,
 		     size_t len2, caddr_t seg2);
 static void le_multi_filter(le_softc_t *sc);
@@ -504,7 +504,7 @@ le_input(
 static int
 le_ioctl(
     struct ifnet *ifp,
-    int cmd,
+    u_long cmd,
     caddr_t data)
 {
     le_softc_t *sc = ifp->if_softc;
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index eb1c4fe..bff5d17 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.c,v 1.41 1998/05/27 09:59:13 paul Exp $
+ * $Id: if_lnc.c,v 1.42 1998/05/27 11:05:17 paul Exp $
  */
 
 /*
@@ -175,7 +175,7 @@ static void lnc_init __P((struct lnc_softc *sc));
 static __inline int mbuf_to_buffer __P((struct mbuf *m, char *buffer));
 static __inline struct mbuf *chain_to_cluster __P((struct mbuf *m));
 static void lnc_start __P((struct ifnet *ifp));
-static int lnc_ioctl __P((struct ifnet *ifp, int command, caddr_t data));
+static int lnc_ioctl __P((struct ifnet *ifp, u_long command, caddr_t data));
 static void lnc_watchdog __P((struct ifnet *ifp));
 #ifdef DEBUG
 static void lnc_dump_state __P((struct lnc_softc *sc));
@@ -1749,7 +1749,7 @@ lnc_start(struct ifnet *ifp)
 }
 
 static int
-lnc_ioctl(struct ifnet * ifp, int command, caddr_t data)
+lnc_ioctl(struct ifnet * ifp, u_long command, caddr_t data)
 {
 
 	struct lnc_softc *sc = ifp->if_softc;
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index 546756f..00427ba 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.11 1998/01/30 19:49:54 jhay Exp $
+ * $Id: if_sr.c,v 1.12 1998/04/17 22:36:35 des Exp $
  */
 
 /*
@@ -273,7 +273,7 @@ void	srintr_hc(struct sr_hardc *hc);
 static int	srattach(struct sr_hardc *hc);
 static void	sr_xmit(struct sr_softc *sc);
 static void	srstart(struct ifnet *ifp);
-static int	srioctl(struct ifnet *ifp, int cmd, caddr_t data);
+static int	srioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
 static void	srwatchdog(struct ifnet *ifp);
 static int	sr_packet_avail(struct sr_softc *sc, int *len, u_char *rxstat);
 static void	sr_copy_rxbuf(struct mbuf *m, struct sr_softc *sc, int len);
@@ -1243,7 +1243,7 @@ static int bug_splats[] = {0, 0, 0, 0, 0, 0, 0, 0};
 #endif
 
 static int
-srioctl(struct ifnet *ifp, int cmd, caddr_t data)
+srioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	int s, error, was_up, should_be_up;
 	struct sppp *sp = (struct sppp *)ifp;
diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index 8908c20..c4bd4db 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.10 1998/01/08 23:41:04 eivind Exp $ */
+/* $Id: if_wl.c,v 1.11 1998/02/20 13:11:47 bde Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -301,7 +301,7 @@ SYSCTL_INT(_machdep, OID_AUTO, wl_gather_snr, CTLFLAG_RW, &gathersnr, 0, "");
 
 static void	wlstart(struct ifnet *ifp);
 static void	wlinit(void *xsc);
-static int	wlioctl(struct ifnet *ifp, int cmd, caddr_t data);
+static int	wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
 static timeout_t wlwatchdog;
 static void	wlxmt(int unt, struct mbuf *m);
 static int	wldiag(int unt); 
@@ -1169,7 +1169,7 @@ wlread(int unit, u_short fd_p)
  *
  */
 static int
-wlioctl(struct ifnet *ifp, int cmd, caddr_t data)
+wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
     register struct ifaddr	*ifa = (struct ifaddr *)data;
     register struct ifreq	*ifr = (struct ifreq *)data;
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index c420c4e..83e3957 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.51 1998/03/28 13:24:24 bde Exp $
+ * $Id: if_ze.c,v 1.52 1998/04/15 17:45:26 bde Exp $
  */
 
 /* XXX don't mix different PCCARD support code. */
@@ -167,7 +167,7 @@ static void ze_init __P((int unit));
 static __inline void ze_xmit __P((struct ifnet *ifp));
 static void ze_start __P((struct ifnet *ifp));
 static __inline void ze_rint __P((int unit));
-static int ze_ioctl __P((struct ifnet *ifp, int command, caddr_t data));
+static int ze_ioctl __P((struct ifnet *ifp, u_long command, caddr_t data));
 static void ze_get_packet __P((struct ze_softc *sc, char *buf, int len));
 static __inline char *ze_ring_copy __P((struct ze_softc *sc, char *src,
 					char *dst, int amount));
@@ -1322,7 +1322,7 @@ zeintr(unit)
 static int
 ze_ioctl(ifp, command, data)
 	register struct ifnet *ifp;
-	int command;
+	u_long command;
 	caddr_t data;
 {
 	register struct ifaddr *ifa = (struct ifaddr *)data;
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index f4b2de0..b2e9ad8 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.46 1998/03/28 13:24:28 bde Exp $
+ *	$Id: if_zp.c,v 1.47 1998/05/26 02:28:18 jmb Exp $
  */
 /*-
  * TODO:
@@ -194,7 +194,7 @@ static int zpprobe __P((struct isa_device *));
 static int zpattach __P((struct isa_device *));
 static int zp_suspend __P((void *visa_dev));
 static int zp_resume __P((void *visa_dev));
-static int zpioctl __P((struct ifnet * ifp, int, caddr_t));
+static int zpioctl __P((struct ifnet * ifp, u_long, caddr_t));
 static u_short read_eeprom_data __P((int, int));
 
 static void zpinit __P((int));
@@ -1007,7 +1007,7 @@ out:	outw(BASE + EP_COMMAND, RX_DISCARD_TOP_PACK);
 static int
 zpioctl(ifp, cmd, data)
 	register struct ifnet *ifp;
-	int     cmd;
+	u_long  cmd;
 	caddr_t data;
 {
 	register struct ifaddr *ifa = (struct ifaddr *) data;
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 8593169..c05b29c 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: istallion.c,v 1.17 1998/02/13 12:45:52 phk Exp $
+ * $Id: istallion.c,v 1.18 1998/04/15 17:45:29 bde Exp $
  */
 
 /*****************************************************************************/
@@ -1158,7 +1158,7 @@ STATIC int stliwrite(dev_t dev, struct uio *uiop, int flag)
 
 /*****************************************************************************/
 
-STATIC int stliioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+STATIC int stliioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	struct termios	*newtios, *localtios;
 	struct tty	*tp;
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index 072be4e..f64d99e5 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/joy.c
@@ -188,7 +188,7 @@ joyread (dev_t dev, struct uio *uio, int flag)
 }
 
 static	int
-joyioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+joyioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
     int unit = UNIT (dev);
     int i = joypart (dev);
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index 049bbc8..3a5b0a6 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -1018,7 +1018,7 @@ labpcstrategy(struct buf *bp)
 }
 
 static	int
-labpcioctl(dev_t dev, int cmd, caddr_t arg, int mode, struct proc *p)
+labpcioctl(dev_t dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
 {
 	struct ctlr *ctlr = labpcs[UNIT(dev)];
 
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index 1af5f8a..b25e2e7 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.67 1998/02/20 04:19:39 steve Exp $
+ *	$Id: lpt.c,v 1.68 1998/04/15 17:45:34 bde Exp $
  */
 
 /*
@@ -276,7 +276,7 @@ static u_char *ctxmith;
 /* Functions for the lp# interface */
 static void lpattach(struct lpt_softc *,int);
 static int lpinittables(void);
-static int lpioctl(struct ifnet *, int, caddr_t);
+static int lpioctl(struct ifnet *, u_long, caddr_t);
 static int lpoutput(struct ifnet *, struct mbuf *, struct sockaddr *,
 	struct rtentry *);
 static void lpintr(int);
@@ -808,7 +808,7 @@ lptintr(int unit)
 }
 
 static	int
-lptioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
+lptioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
 {
 	int	error = 0;
         struct	lpt_softc *sc;
@@ -918,7 +918,7 @@ lpinittables (void)
  */
 
 static int
-lpioctl (struct ifnet *ifp, int cmd, caddr_t data)
+lpioctl (struct ifnet *ifp, u_long cmd, caddr_t data)
 {
     struct lpt_softc *sc = lpt_sc + ifp->if_unit;
     struct ifaddr *ifa = (struct ifaddr *)data;
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index ba30c2f..d3bd4e5 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,7 +337,7 @@ static char	MATCDVERSION[]="Version  1(26) 18-Oct-95";
 static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
 /*	The proceeding strings may not be changed*/
 
-/* $Id: matcd.c,v 1.31 1997/12/02 21:06:37 phk Exp $ */
+/* $Id: matcd.c,v 1.32 1998/01/24 02:54:32 eivind Exp $ */
 
 /*---------------------------------------------------------------------------
 	Include declarations
@@ -979,7 +979,7 @@ static void matcd_start(int controller)
 	things that don't fit into the block read scheme of things.
 ---------------------------------------------------------------------------*/
 
-int matcdioctl(dev_t dev, int command, caddr_t addr,
+int matcdioctl(dev_t dev, u_long command, caddr_t addr,
 	       int flags, struct proc *p)
 {
 	struct	matcd_data *cd;
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 9121a71..1129d94 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.96 1997/12/02 21:06:25 phk Exp $
+ *	$Id: mcd.c,v 1.97 1998/01/24 02:54:22 eivind Exp $
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -506,7 +506,7 @@ static void mcd_start(int unit)
 	return;
 }
 
-int mcdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
+int mcdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 {
 	struct mcd_data *cd;
 	int unit,part,retry,r;
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 2f558d8..d907e4c 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.36 1997/12/07 08:09:16 yokota Exp $
+ * $Id: mse.c,v 1.37 1998/01/24 02:54:22 eivind Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -401,7 +401,7 @@ mseread(dev, uio, ioflag)
 static int
 mseioctl(dev, cmd, addr, flag, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t addr;
 	int flag;
 	struct proc *p;
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index c43139b..a574afb 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudio.c,v 1.39 1998/01/24 02:54:22 eivind Exp $
+ *	$Id: pcaudio.c,v 1.40 1998/04/15 17:45:40 bde Exp $
  */
 
 #include "pca.h"
@@ -390,7 +390,7 @@ pcawrite(dev_t dev, struct uio *uio, int flag)
 
 
 static int
-pcaioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+pcaioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	audio_info_t *auptr;
 
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index c589b0d..ff6566a 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -585,7 +585,7 @@ pcwrite(Dev_t dev, struct uio *uio, int flag)
 }
 
 int
-pcioctl(Dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+pcioctl(Dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	register error;
 	register struct tty *tp;
diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c
index b36a7a7..440347f 100644
--- a/sys/i386/isa/psm.c
+++ b/sys/i386/isa/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.51 1998/03/28 10:33:01 bde Exp $
+ * $Id: psm.c,v 1.52 1998/04/15 17:06:52 phk Exp $
  */
 
 /*
@@ -1366,7 +1366,7 @@ unblock_mouse_data(struct psm_softc *sc, int c)
 }
 
 static int
-psmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
+psmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
     struct psm_softc *sc = psm_softc[PSM_UNIT(dev)];
     mousemode_t mode;
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 784527f..31d738c 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -1090,7 +1090,8 @@ struct rc_softc         *rcb;
 static	int
 rcioctl(dev, cmd, data, flag, p)
 dev_t           dev;
-int             cmd, flag;
+u_long          cmd;
+int		flag;
 caddr_t         data;
 struct proc     *p;
 {
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index e6f2af0..1c6e526 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -1586,7 +1586,7 @@ rpdtrwakeup(void *chan)
 int
 rpioctl(dev, cmd, data, flag, p)
 	dev_t	dev;
-	int	cmd;
+	u_long	cmd;
 	caddr_t data;
 	int	flag;
 	struct	proc	*p;
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index 6d25f89..339ccfd 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.35 1998/01/24 02:54:24 eivind Exp $ */
+/* $Id: scd.c,v 1.36 1998/04/15 17:45:48 bde Exp $ */
 
 /* Please send any comments to micke@dynas.se */
 
@@ -418,7 +418,7 @@ scd_start(int unit)
 }
 
 static	int
-scdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
+scdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 {
 	struct scd_data *cd;
 	int unit,part;
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 52838cf..92dda3d 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.69 1998/03/23 16:27:37 peter Exp $
+ *	$Id: si.c,v 1.70 1998/03/28 13:24:39 bde Exp $
  */
 
 #ifndef lint
@@ -1481,7 +1481,7 @@ sidevtotty(dev_t dev)
 static	int
 siioctl(dev, cmd, data, flag, p)
 	dev_t dev;
-	int cmd;
+	u_long cmd;
 	caddr_t data;
 	int flag;
 	struct proc *p;
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 898f080..776a50c 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.204 1998/06/03 09:43:38 bde Exp $
+ *	$Id: sio.c,v 1.205 1998/06/03 12:30:10 bde Exp $
  */
 
 #include "opt_comconsole.h"
@@ -1688,7 +1688,7 @@ cont:
 static int
 sioioctl(dev, cmd, data, flag, p)
 	dev_t		dev;
-	int		cmd;
+	u_long		cmd;
 	caddr_t		data;
 	int		flag;
 	struct proc	*p;
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index c3cbbc0..c1ffa7d 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -218,7 +218,7 @@ sndclose(dev_t dev, int flags, int mode, struct proc * p)
 }
 
 static int
-sndioctl(dev_t dev, int cmd, caddr_t arg, int mode, struct proc * p)
+sndioctl(dev_t dev, u_long cmd, caddr_t arg, int mode, struct proc * p)
 {
     dev = minor(dev);
     FIX_RETURN(sound_ioctl_sw(dev, &files[dev], cmd, arg));
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index bda05c8..4639a14 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -204,7 +204,7 @@ spigot_read(dev_t dev, struct uio *uio, int ioflag)
 
 
 static	int
-spigot_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+spigot_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 int			error;
 struct	spigot_softc	*ss = (struct spigot_softc *)&spigot_softc[UNIT(dev)];
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 952d822..e090bc8 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.32 1998/02/09 06:08:41 eivind Exp $
+ *    $Id: spkr.c,v 1.33 1998/02/20 13:46:55 bde Exp $
  */
 
 #include "speaker.h"
@@ -540,7 +540,7 @@ spkrclose(dev, flags, fmt, p)
 int
 spkrioctl(dev, cmd, cmdarg, flags, p)
 	dev_t		dev;
-	int		cmd;
+	u_long		cmd;
 	caddr_t		cmdarg;
 	int		flags;
 	struct proc	*p;
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 3737b00..d12befc 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: stallion.c,v 1.18 1998/03/28 13:24:43 bde Exp $
+ * $Id: stallion.c,v 1.19 1998/04/15 17:45:50 bde Exp $
  */
 
 /*****************************************************************************/
@@ -963,7 +963,7 @@ STATIC int stlwrite(dev_t dev, struct uio *uiop, int flag)
 
 /*****************************************************************************/
 
-STATIC int stlioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+STATIC int stlioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
 	struct termios	*newtios, *localtios;
 	struct tty	*tp;
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index c7c02e9..748833b 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.260 1998/04/17 10:03:11 des Exp $
+ *  $Id: syscons.c,v 1.261 1998/05/17 11:52:18 phk Exp $
  */
 
 #include "sc.h"
@@ -984,7 +984,7 @@ scparam(struct tty *tp, struct termios *t)
 }
 
 int
-scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 {
     int error;
     u_int i;
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index 88f74d5..d961964 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -13,7 +13,7 @@
  * all derivative works or modified versions.
  *
  * From: Version 1.9, Mon Oct  9 20:27:42 MSK 1995
- * $Id: wcd.c,v 1.51 1998/02/09 06:08:43 eivind Exp $
+ * $Id: wcd.c,v 1.52 1998/04/15 17:45:53 bde Exp $
  */
 
 #include "wdc.h"
@@ -742,7 +742,7 @@ static __inline void lba2msf (int lba, u_char *m, u_char *s, u_char *f)
  * Perform special action on behalf of the user.
  * Knows about the internals of this device
  */
-int wcdioctl (dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
+int wcdioctl (dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	int lun = dkunit(dev);
 	struct wcd *t = wcdtab[lun];
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 36e1d4f..367dfb9 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.166 1998/05/07 01:15:23 julian Exp $
+ *	$Id: wd.c,v 1.167 1998/05/11 15:30:43 sos Exp $
  */
 
 /* TODO:
@@ -2127,7 +2127,7 @@ wdclose(dev_t dev, int flags, int fmt, struct proc *p)
 }
 
 int
-wdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p)
+wdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 {
 	int	lunit = dkunit(dev);
 	register struct disk *du;
diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c
index ed84f5f..f63ebaa 100644
--- a/sys/i386/isa/wfd.c
+++ b/sys/i386/isa/wfd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: wfd.c,v 1.8 1998/02/13 22:41:00 pst Exp $
+ *      $Id: wfd.c,v 1.9 1998/03/20 23:14:52 msmith Exp $
  */
 
 /*
@@ -617,7 +617,7 @@ static int wfd_request_wait (struct wfd *t, u_char cmd, u_char a1, u_char a2,
  * Perform special action on behalf of the user.
  * Knows about the internals of this device
  */
-int wfdioctl (dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
+int wfdioctl (dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
 {
 	int lun = UNIT(dev);
 	struct wfd *t = wfdtab[lun];
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 3f4e735..9c317a6 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -20,7 +20,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.42 1997/12/02 21:06:34 phk Exp $
+ * $Id: wt.c,v 1.43 1998/01/24 02:54:28 eivind Exp $
  *
  */
 
@@ -423,7 +423,7 @@ done:
  * ioctl (int fd, MTIOCTOP, struct mtop *buf)   -- do BSD-like op
  */
 int
-wtioctl (dev_t dev, int cmd, caddr_t arg, int flags, struct proc *p)
+wtioctl (dev_t dev, u_long cmd, caddr_t arg, int flags, struct proc *p)
 {
 	int u = minor (dev) & T_UNIT;
 	wtinfo_t *t = wttab + u;
diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c
index dfe001d..ed5f751 100644
--- a/sys/i386/linux/linux_ioctl.c
+++ b/sys/i386/linux/linux_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ioctl.c,v 1.22 1997/11/17 04:00:32 ahasty Exp $
+ *  $Id: linux_ioctl.c,v 1.23 1997/12/15 06:09:11 msmith Exp $
  */
 
 #include <sys/param.h>
@@ -455,7 +455,7 @@ linux_ioctl(struct proc *p, struct linux_ioctl_args *args)
     struct linux_termio linux_termio;
     struct filedesc *fdp = p->p_fd;
     struct file *fp;
-    int (*func)(struct file *fp, int com, caddr_t data, struct proc *p);
+    int (*func)(struct file *fp, u_long com, caddr_t data, struct proc *p);
     int bsd_line, linux_line;
     int error;
 
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 8fd2ed0..c5909b6 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -12,362 +12,365 @@
 
 struct proc;
 
+#define PAD_(t) sizeof(register_t) <= sizeof(t) ? \
+		0 : sizeof(register_t) - sizeof(t)
+
 struct	linux_setup_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_fork_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_open_args {
-	char * path;
-	int flags;
-	int mode;
+	char * path;	char path_[PAD_(char *)];
+	int flags;	char flags_[PAD_(int)];
+	int mode;	char mode_[PAD_(int)];
 };
 struct	linux_waitpid_args {
-	int pid;
-	int * status;
-	int options;
+	int pid;	char pid_[PAD_(int)];
+	int * status;	char status_[PAD_(int *)];
+	int options;	char options_[PAD_(int)];
 };
 struct	linux_creat_args {
-	char * path;
-	int mode;
+	char * path;	char path_[PAD_(char *)];
+	int mode;	char mode_[PAD_(int)];
 };
 struct	linux_unlink_args {
-	char * path;
+	char * path;	char path_[PAD_(char *)];
 };
 struct	linux_execve_args {
-	char * path;
-	char ** argp;
-	char ** envp;
+	char * path;	char path_[PAD_(char *)];
+	char ** argp;	char argp_[PAD_(char **)];
+	char ** envp;	char envp_[PAD_(char **)];
 };
 struct	linux_chdir_args {
-	char * path;
+	char * path;	char path_[PAD_(char *)];
 };
 struct	linux_time_args {
-	linux_time_t * tm;
+	linux_time_t * tm;	char tm_[PAD_(linux_time_t *)];
 };
 struct	linux_mknod_args {
-	char * path;
-	int mode;
-	int dev;
+	char * path;	char path_[PAD_(char *)];
+	int mode;	char mode_[PAD_(int)];
+	int dev;	char dev_[PAD_(int)];
 };
 struct	linux_chmod_args {
-	char * path;
-	int mode;
+	char * path;	char path_[PAD_(char *)];
+	int mode;	char mode_[PAD_(int)];
 };
 struct	linux_lchown_args {
-	char * path;
-	int uid;
-	int gid;
+	char * path;	char path_[PAD_(char *)];
+	int uid;	char uid_[PAD_(int)];
+	int gid;	char gid_[PAD_(int)];
 };
 struct	linux_break_args {
-	char * nsize;
+	char * nsize;	char nsize_[PAD_(char *)];
 };
 struct	linux_stat_args {
-	char * path;
-	struct ostat * up;
+	char * path;	char path_[PAD_(char *)];
+	struct ostat * up;	char up_[PAD_(struct ostat *)];
 };
 struct	linux_lseek_args {
-	int fdes;
-	long off;
-	int whence;
+	int fdes;	char fdes_[PAD_(int)];
+	long off;	char off_[PAD_(long)];
+	int whence;	char whence_[PAD_(int)];
 };
 struct	linux_mount_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_umount_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_stime_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_ptrace_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_alarm_args {
-	unsigned int secs;
+	unsigned int secs;	char secs_[PAD_(unsigned int)];
 };
 struct	linux_fstat_args {
-	int fd;
-	struct ostat * up;
+	int fd;	char fd_[PAD_(int)];
+	struct ostat * up;	char up_[PAD_(struct ostat *)];
 };
 struct	linux_pause_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_utime_args {
-	char * fname;
-	struct linux_utimbuf * times;
+	char * fname;	char fname_[PAD_(char *)];
+	struct linux_utimbuf * times;	char times_[PAD_(struct linux_utimbuf *)];
 };
 struct	linux_stty_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_gtty_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_access_args {
-	char * path;
-	int flags;
+	char * path;	char path_[PAD_(char *)];
+	int flags;	char flags_[PAD_(int)];
 };
 struct	linux_nice_args {
-	int inc;
+	int inc;	char inc_[PAD_(int)];
 };
 struct	linux_ftime_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_kill_args {
-	int pid;
-	int signum;
+	int pid;	char pid_[PAD_(int)];
+	int signum;	char signum_[PAD_(int)];
 };
 struct	linux_rename_args {
-	char * from;
-	char * to;
+	char * from;	char from_[PAD_(char *)];
+	char * to;	char to_[PAD_(char *)];
 };
 struct	linux_mkdir_args {
-	char * path;
-	int mode;
+	char * path;	char path_[PAD_(char *)];
+	int mode;	char mode_[PAD_(int)];
 };
 struct	linux_rmdir_args {
-	char * path;
+	char * path;	char path_[PAD_(char *)];
 };
 struct	linux_pipe_args {
-	int * pipefds;
+	int * pipefds;	char pipefds_[PAD_(int *)];
 };
 struct	linux_times_args {
-	struct linux_times_argv * buf;
+	struct linux_times_argv * buf;	char buf_[PAD_(struct linux_times_argv *)];
 };
 struct	linux_prof_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_brk_args {
-	char * dsend;
+	char * dsend;	char dsend_[PAD_(char *)];
 };
 struct	linux_signal_args {
-	int sig;
-	linux_handler_t handler;
+	int sig;	char sig_[PAD_(int)];
+	linux_handler_t handler;	char handler_[PAD_(linux_handler_t)];
 };
 struct	linux_phys_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_lock_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_ioctl_args {
-	int fd;
-	u_long cmd;
-	int arg;
+	int fd;	char fd_[PAD_(int)];
+	u_long cmd;	char cmd_[PAD_(u_long)];
+	int arg;	char arg_[PAD_(int)];
 };
 struct	linux_fcntl_args {
-	int fd;
-	int cmd;
-	int arg;
+	int fd;	char fd_[PAD_(int)];
+	int cmd;	char cmd_[PAD_(int)];
+	int arg;	char arg_[PAD_(int)];
 };
 struct	linux_mpx_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_ulimit_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_olduname_args {
-	struct linux_oldold_utsname * up;
+	struct linux_oldold_utsname * up;	char up_[PAD_(struct linux_oldold_utsname *)];
 };
 struct	linux_ustat_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_sigaction_args {
-	int sig;
-	struct linux_sigaction * nsa;
-	struct linux_sigaction * osa;
+	int sig;	char sig_[PAD_(int)];
+	struct linux_sigaction * nsa;	char nsa_[PAD_(struct linux_sigaction *)];
+	struct linux_sigaction * osa;	char osa_[PAD_(struct linux_sigaction *)];
 };
 struct	linux_siggetmask_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_sigsetmask_args {
-	linux_sigset_t mask;
+	linux_sigset_t mask;	char mask_[PAD_(linux_sigset_t)];
 };
 struct	linux_sigsuspend_args {
-	int restart;
-	linux_sigset_t oldmask;
-	linux_sigset_t mask;
+	int restart;	char restart_[PAD_(int)];
+	linux_sigset_t oldmask;	char oldmask_[PAD_(linux_sigset_t)];
+	linux_sigset_t mask;	char mask_[PAD_(linux_sigset_t)];
 };
 struct	linux_sigpending_args {
-	linux_sigset_t * mask;
+	linux_sigset_t * mask;	char mask_[PAD_(linux_sigset_t *)];
 };
 struct	linux_select_args {
-	struct linux_select_argv * ptr;
+	struct linux_select_argv * ptr;	char ptr_[PAD_(struct linux_select_argv *)];
 };
 struct	linux_symlink_args {
-	char * path;
-	char * to;
+	char * path;	char path_[PAD_(char *)];
+	char * to;	char to_[PAD_(char *)];
 };
 struct	linux_readlink_args {
-	char * name;
-	char * buf;
-	int count;
+	char * name;	char name_[PAD_(char *)];
+	char * buf;	char buf_[PAD_(char *)];
+	int count;	char count_[PAD_(int)];
 };
 struct	linux_uselib_args {
-	char * library;
+	char * library;	char library_[PAD_(char *)];
 };
 struct	linux_readdir_args {
-	int fd;
-	struct linux_dirent * dent;
-	unsigned int count;
+	int fd;	char fd_[PAD_(int)];
+	struct linux_dirent * dent;	char dent_[PAD_(struct linux_dirent *)];
+	unsigned int count;	char count_[PAD_(unsigned int)];
 };
 struct	linux_mmap_args {
-	struct linux_mmap_argv * ptr;
+	struct linux_mmap_argv * ptr;	char ptr_[PAD_(struct linux_mmap_argv *)];
 };
 struct	linux_truncate_args {
-	char * path;
-	long length;
+	char * path;	char path_[PAD_(char *)];
+	long length;	char length_[PAD_(long)];
 };
 struct	linux_statfs_args {
-	char * path;
-	struct linux_statfs_buf * buf;
+	char * path;	char path_[PAD_(char *)];
+	struct linux_statfs_buf * buf;	char buf_[PAD_(struct linux_statfs_buf *)];
 };
 struct	linux_fstatfs_args {
-	int fd;
-	struct linux_statfs_buf * buf;
+	int fd;	char fd_[PAD_(int)];
+	struct linux_statfs_buf * buf;	char buf_[PAD_(struct linux_statfs_buf *)];
 };
 struct	linux_ioperm_args {
-	unsigned int lo;
-	unsigned int hi;
-	int val;
+	unsigned int lo;	char lo_[PAD_(unsigned int)];
+	unsigned int hi;	char hi_[PAD_(unsigned int)];
+	int val;	char val_[PAD_(int)];
 };
 struct	linux_socketcall_args {
-	int what;
-	void * args;
+	int what;	char what_[PAD_(int)];
+	void * args;	char args_[PAD_(void *)];
 };
 struct	linux_ksyslog_args {
-	int what;
+	int what;	char what_[PAD_(int)];
 };
 struct	linux_setitimer_args {
-	u_int which;
-	struct itimerval * itv;
-	struct itimerval * oitv;
+	u_int which;	char which_[PAD_(u_int)];
+	struct itimerval * itv;	char itv_[PAD_(struct itimerval *)];
+	struct itimerval * oitv;	char oitv_[PAD_(struct itimerval *)];
 };
 struct	linux_getitimer_args {
-	u_int which;
-	struct itimerval * itv;
+	u_int which;	char which_[PAD_(u_int)];
+	struct itimerval * itv;	char itv_[PAD_(struct itimerval *)];
 };
 struct	linux_newstat_args {
-	char * path;
-	struct linux_newstat * buf;
+	char * path;	char path_[PAD_(char *)];
+	struct linux_newstat * buf;	char buf_[PAD_(struct linux_newstat *)];
 };
 struct	linux_newlstat_args {
-	char * path;
-	struct linux_newstat * buf;
+	char * path;	char path_[PAD_(char *)];
+	struct linux_newstat * buf;	char buf_[PAD_(struct linux_newstat *)];
 };
 struct	linux_newfstat_args {
-	int fd;
-	struct linux_newstat * buf;
+	int fd;	char fd_[PAD_(int)];
+	struct linux_newstat * buf;	char buf_[PAD_(struct linux_newstat *)];
 };
 struct	linux_uname_args {
-	struct linux_old_utsname * up;
+	struct linux_old_utsname * up;	char up_[PAD_(struct linux_old_utsname *)];
 };
 struct	linux_iopl_args {
-	int level;
+	int level;	char level_[PAD_(int)];
 };
 struct	linux_vhangup_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_idle_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_vm86_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_wait4_args {
-	int pid;
-	int * status;
-	int options;
-	struct rusage * rusage;
+	int pid;	char pid_[PAD_(int)];
+	int * status;	char status_[PAD_(int *)];
+	int options;	char options_[PAD_(int)];
+	struct rusage * rusage;	char rusage_[PAD_(struct rusage *)];
 };
 struct	linux_swapoff_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_sysinfo_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_ipc_args {
-	int what;
-	int arg1;
-	int arg2;
-	int arg3;
-	caddr_t ptr;
+	int what;	char what_[PAD_(int)];
+	int arg1;	char arg1_[PAD_(int)];
+	int arg2;	char arg2_[PAD_(int)];
+	int arg3;	char arg3_[PAD_(int)];
+	caddr_t ptr;	char ptr_[PAD_(caddr_t)];
 };
 struct	linux_sigreturn_args {
-	struct linux_sigcontext * scp;
+	struct linux_sigcontext * scp;	char scp_[PAD_(struct linux_sigcontext *)];
 };
 struct	linux_clone_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_newuname_args {
-	struct linux_newuname_t * buf;
+	struct linux_newuname_t * buf;	char buf_[PAD_(struct linux_newuname_t *)];
 };
 struct	linux_modify_ldt_args {
-	int func;
-	void * ptr;
-	size_t bytecount;
+	int func;	char func_[PAD_(int)];
+	void * ptr;	char ptr_[PAD_(void *)];
+	size_t bytecount;	char bytecount_[PAD_(size_t)];
 };
 struct	linux_adjtimex_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_sigprocmask_args {
-	int how;
-	linux_sigset_t * mask;
-	linux_sigset_t * omask;
+	int how;	char how_[PAD_(int)];
+	linux_sigset_t * mask;	char mask_[PAD_(linux_sigset_t *)];
+	linux_sigset_t * omask;	char omask_[PAD_(linux_sigset_t *)];
 };
 struct	linux_create_module_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_init_module_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_delete_module_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_get_kernel_syms_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_quotactl_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_getpgid_args {
-	int pid;
+	int pid;	char pid_[PAD_(int)];
 };
 struct	linux_bdflush_args {
-	int dummy;
+	register_t dummy;
 };
 struct	linux_personality_args {
-	int per;
+	int per;	char per_[PAD_(int)];
 };
 struct	linux_llseek_args {
-	int fd;
-	u_int32_t ohigh;
-	u_int32_t olow;
-	caddr_t res;
-	int whence;
+	int fd;	char fd_[PAD_(int)];
+	u_int32_t ohigh;	char ohigh_[PAD_(u_int32_t)];
+	u_int32_t olow;	char olow_[PAD_(u_int32_t)];
+	caddr_t res;	char res_[PAD_(caddr_t)];
+	int whence;	char whence_[PAD_(int)];
 };
 struct	linux_getdents_args {
-	int fd;
-	void * dent;
-	unsigned count;
+	int fd;	char fd_[PAD_(int)];
+	void * dent;	char dent_[PAD_(void *)];
+	unsigned count;	char count_[PAD_(unsigned)];
 };
 struct	linux_newselect_args {
-	int nfds;
-	fd_set * readfds;
-	fd_set * writefds;
-	fd_set * exceptfds;
-	struct timeval * timeout;
+	int nfds;	char nfds_[PAD_(int)];
+	fd_set * readfds;	char readfds_[PAD_(fd_set *)];
+	fd_set * writefds;	char writefds_[PAD_(fd_set *)];
+	fd_set * exceptfds;	char exceptfds_[PAD_(fd_set *)];
+	struct timeval * timeout;	char timeout_[PAD_(struct timeval *)];
 };
 struct	linux_msync_args {
-	caddr_t addr;
-	int len;
-	int fl;
+	caddr_t addr;	char addr_[PAD_(caddr_t)];
+	int len;	char len_[PAD_(int)];
+	int fl;	char fl_[PAD_(int)];
 };
 struct	linux_chown_args {
-	char * path;
-	int uid;
-	int gid;
+	char * path;	char path_[PAD_(char *)];
+	int uid;	char uid_[PAD_(int)];
+	int gid;	char gid_[PAD_(int)];
 };
 int	linux_setup __P((struct proc *, struct linux_setup_args *));
 int	linux_fork __P((struct proc *, struct linux_fork_args *));
@@ -470,4 +473,6 @@ int	linux_chown __P((struct proc *, struct linux_chown_args *));
 
 #endif /* COMPAT_43 */
 
+#undef PAD_
+
 #endif /* !_LINUX_SYSPROTO_H_ */
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 798d9a9..f63b9aa 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_sysvec.c,v 1.28 1998/04/28 18:15:06 eivind Exp $
+ *  $Id: linux_sysvec.c,v 1.29 1998/05/07 00:42:25 eivind Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -56,9 +56,9 @@
 #include <i386/linux/linux.h>
 #include <i386/linux/linux_proto.h>
 
-static int	linux_fixup __P((int **stack_base,
+static int	linux_fixup __P((long **stack_base,
 				 struct image_params *iparams));
-static int	elf_linux_fixup __P((int **stack_base,
+static int	elf_linux_fixup __P((long **stack_base,
 				     struct image_params *iparams));
 static void	linux_prepsyscall __P((struct trapframe *tf, int *args,
 				       u_int *code, caddr_t *params));
@@ -119,26 +119,26 @@ translate_traps(int signal, int trap_code)
 }
 
 static int
-linux_fixup(int **stack_base, struct image_params *imgp)
+linux_fixup(long **stack_base, struct image_params *imgp)
 {
-	int *argv, *envp;
+	long *argv, *envp;
 
 	argv = *stack_base;
 	envp = *stack_base + (imgp->argc + 1);
 	(*stack_base)--;
-	**stack_base = (int)envp;
+	**stack_base = (long)envp;
 	(*stack_base)--;
-	**stack_base = (int)argv;
+	**stack_base = (long)argv;
 	(*stack_base)--;
-	**stack_base = (int)imgp->argc;
+	**stack_base = (long)imgp->argc;
 	return 0;
 }
 
 static int
-elf_linux_fixup(int **stack_base, struct image_params *imgp)
+elf_linux_fixup(long **stack_base, struct image_params *imgp)
 {
 	Elf32_Auxargs *args = (Elf32_Auxargs *)imgp->auxargs;
-	int *pos;
+	long *pos;
              
 	pos = *stack_base + (imgp->argc + imgp->envc + 2);  
     
@@ -165,7 +165,7 @@ elf_linux_fixup(int **stack_base, struct image_params *imgp)
 	imgp->auxargs = NULL;
 
 	(*stack_base)--;
-	**stack_base = (int)imgp->argc;
+	**stack_base = (long)imgp->argc;
 	return 0;
 }
 
@@ -316,7 +316,7 @@ linux_sigreturn(p, args)
 	 * It is unsafe to keep track of it ourselves, in the event that a
 	 * program jumps out of a signal handler.
 	 */
-	scp = args->scp;
+	scp = SCARG(args,scp);
 	if (copyin((caddr_t)scp, &context, sizeof(*scp)) != 0)
 		return (EFAULT);