diff options
author | dfr <dfr@FreeBSD.org> | 1998-06-07 17:13:14 +0000 |
---|---|---|
committer | dfr <dfr@FreeBSD.org> | 1998-06-07 17:13:14 +0000 |
commit | 1d5f38ac2264102518a09c66a7b285f57e81e67e (patch) | |
tree | 83ce2f0e2b8041d2c933d3beffc1f4465ea5b929 /sys/fs | |
parent | 83423d0e5a4ad035e44392f0427cb39232031e45 (diff) | |
download | FreeBSD-src-1d5f38ac2264102518a09c66a7b285f57e81e67e.zip FreeBSD-src-1d5f38ac2264102518a09c66a7b285f57e81e67e.tar.gz |
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.
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/cd9660/cd9660_vfsops.c | 4 | ||||
-rw-r--r-- | sys/fs/procfs/procfs_mem.c | 4 | ||||
-rw-r--r-- | sys/fs/procfs/procfs_vfsops.c | 4 | ||||
-rw-r--r-- | sys/fs/specfs/spec_vnops.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index b5e9915..84a6f20 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $Id: cd9660_vfsops.c,v 1.38 1998/04/20 23:18:46 julian Exp $ + * $Id: cd9660_vfsops.c,v 1.39 1998/05/06 05:29:30 msmith Exp $ */ #include <sys/param.h> @@ -197,7 +197,7 @@ cd9660_mount(mp, path, data, ndp, p) { struct vnode *devvp; struct iso_args args; - u_int size; + size_t size; int error; struct iso_mnt *imp = 0; diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c index 29c883c..27cb4f5 100644 --- a/sys/fs/procfs/procfs_mem.c +++ b/sys/fs/procfs/procfs_mem.c @@ -37,7 +37,7 @@ * * @(#)procfs_mem.c 8.5 (Berkeley) 6/15/94 * - * $Id: procfs_mem.c,v 1.31 1998/04/17 22:36:55 des Exp $ + * $Id: procfs_mem.c,v 1.32 1998/05/19 00:00:14 tegge Exp $ */ /* @@ -159,7 +159,7 @@ procfs_rwmem(curp, p, uio) fill_eproc (p, &p->p_addr->u_kproc.kp_eproc); /* locate the in-core address */ - tkva = (u_int)p->p_addr + uva - VM_MAXUSER_ADDRESS; + tkva = (u_long)p->p_addr + uva - VM_MAXUSER_ADDRESS; /* transfer it */ error = uiomove((caddr_t)tkva, len, uio); diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c index f75de09..0827be1 100644 --- a/sys/fs/procfs/procfs_vfsops.c +++ b/sys/fs/procfs/procfs_vfsops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95 * - * $Id: procfs_vfsops.c,v 1.20 1998/03/01 22:46:22 msmith Exp $ + * $Id: procfs_vfsops.c,v 1.21 1998/05/06 05:29:36 msmith Exp $ */ /* @@ -75,7 +75,7 @@ procfs_mount(mp, path, data, ndp, p) struct nameidata *ndp; struct proc *p; { - u_int size; + size_t size; if (UIO_MX & (UIO_MX-1)) { log(LOG_ERR, "procfs: invalid directory entry size\n"); diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index a168bc8..ef39ab5 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $Id: spec_vnops.c,v 1.61 1998/04/19 23:32:26 julian Exp $ + * $Id: spec_vnops.c,v 1.62 1998/05/21 07:47:49 dyson Exp $ */ #include <sys/param.h> @@ -431,7 +431,7 @@ spec_ioctl(ap) ap->a_fflag, ap->a_p)); case VBLK: - if (ap->a_command == 0 && (int)ap->a_data == B_TAPE) + if (ap->a_command == 0 && (long)ap->a_data == B_TAPE) if ((bdevsw[major(dev)]->d_flags & D_TYPEMASK) == D_TAPE) return (0); |