summaryrefslogtreecommitdiff
path: root/sys/compat/linux/common/linux_misc.c
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2007-03-04 05:59:00 +0000
committerchristos <christos@NetBSD.org>2007-03-04 05:59:00 +0000
commit53524e44efd7c7176da8dc8190a698b2fe184db1 (patch)
tree68b6fb4aee85c3eb0a522cc199c3a3427938828e /sys/compat/linux/common/linux_misc.c
parent1b20cebad5f8d3582a41d5599641a95247721732 (diff)
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/compat/linux/common/linux_misc.c')
-rw-r--r--sys/compat/linux/common/linux_misc.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/sys/compat/linux/common/linux_misc.c b/sys/compat/linux/common/linux_misc.c
index 5564426d558..7484685f309 100644
--- a/sys/compat/linux/common/linux_misc.c
+++ b/sys/compat/linux/common/linux_misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.166 2007/02/09 21:55:19 ad Exp $ */
+/* $NetBSD: linux_misc.c,v 1.167 2007/03/04 06:01:24 christos Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.166 2007/02/09 21:55:19 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.167 2007/03/04 06:01:24 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ptrace.h"
@@ -231,7 +231,7 @@ linux_sys_wait4(l, v, retval)
struct proc *p = l->l_proc;
struct sys_wait4_args w4a;
int error, *status, tstat, options, linux_options;
- caddr_t sg;
+ void *sg;
if (SCARG(uap, status) != NULL) {
sg = stackgap_init(p, 0);
@@ -302,7 +302,7 @@ linux_sys_brk(l, v, retval)
SCARG(&oba, nsize) = nbrk;
- if ((caddr_t) nbrk > vm->vm_daddr && sys_obreak(l, &oba, retval) == 0)
+ if ((void *) nbrk > vm->vm_daddr && sys_obreak(l, &oba, retval) == 0)
ed->s->p_break = (char*)nbrk;
else
nbrk = ed->s->p_break;
@@ -381,7 +381,7 @@ linux_sys_statfs(l, v, retval)
struct statvfs *btmp, *bsp;
struct linux_statfs ltmp;
struct sys_statvfs1_args bsa;
- caddr_t sg;
+ void *sg;
int error;
sg = stackgap_init(p, 0);
@@ -422,7 +422,7 @@ linux_sys_fstatfs(l, v, retval)
struct statvfs *btmp, *bsp;
struct linux_statfs ltmp;
struct sys_fstatvfs1_args bsa;
- caddr_t sg;
+ void *sg;
int error;
sg = stackgap_init(p, 0);
@@ -676,7 +676,7 @@ linux_sys_msync(l, v, retval)
register_t *retval;
{
struct linux_sys_msync_args /* {
- syscallarg(caddr_t) addr;
+ syscallarg(void *) addr;
syscallarg(int) len;
syscallarg(int) fl;
} */ *uap = v;
@@ -827,9 +827,9 @@ linux_sys_getdents(l, v, retval)
} */ *uap = v;
struct dirent *bdp;
struct vnode *vp;
- caddr_t inp, tbuf; /* BSD-format */
+ char *inp, *tbuf; /* BSD-format */
int len, reclen; /* BSD-format */
- caddr_t outp; /* Linux-format */
+ char *outp; /* Linux-format */
int resid, linux_reclen = 0; /* Linux-format */
struct file *fp;
struct uio auio;
@@ -893,7 +893,7 @@ again:
goto out;
inp = tbuf;
- outp = (caddr_t)SCARG(uap, dent);
+ outp = (void *)SCARG(uap, dent);
resid = nbytes;
if ((len = buflen - auio.uio_resid) == 0)
goto eof;
@@ -939,7 +939,7 @@ again:
idb.d_reclen = (u_short)linux_reclen;
}
strcpy(idb.d_name, bdp->d_name);
- if ((error = copyout((caddr_t)&idb, outp, linux_reclen)))
+ if ((error = copyout((void *)&idb, outp, linux_reclen)))
goto out;
/* advance past this real entry */
inp += reclen;
@@ -955,7 +955,7 @@ again:
}
/* if we squished out the whole block, try again */
- if (outp == (caddr_t)SCARG(uap, dent))
+ if (outp == (void *)SCARG(uap, dent))
goto again;
fp->f_offset = off; /* update the vnode offset */
@@ -1014,7 +1014,7 @@ linux_select1(l, retval, nfds, readfds, writefds, exceptfds, timeout)
struct sys_select_args bsa;
struct proc *p = l->l_proc;
struct timeval tv0, tv1, utv, *tvp;
- caddr_t sg;
+ void *sg;
int error;
SCARG(&bsa, nd) = nfds;
@@ -1233,7 +1233,7 @@ linux_sys_getgroups16(l, v, retval)
syscallarg(linux_gid_t *) gidset;
} */ *uap = v;
struct proc *p = l->l_proc;
- caddr_t sg;
+ void *sg;
int n, error, i;
struct sys_getgroups_args bsa;
gid_t *bset, *kbset;
@@ -1290,7 +1290,7 @@ linux_sys_setgroups16(l, v, retval)
syscallarg(linux_gid_t *) gidset;
} */ *uap = v;
struct proc *p = l->l_proc;
- caddr_t sg;
+ void *sg;
int n;
int error, i;
struct sys_setgroups_args bsa;
@@ -1451,17 +1451,17 @@ linux_sys_ptrace(l, v, retval)
SCARG(&pta, req) = *ptr;
SCARG(&pta, pid) = SCARG(uap, pid);
- SCARG(&pta, addr) = (caddr_t)SCARG(uap, addr);
+ SCARG(&pta, addr) = (void *)SCARG(uap, addr);
SCARG(&pta, data) = SCARG(uap, data);
/*
* Linux ptrace(PTRACE_CONT, pid, 0, 0) means actually
* to continue where the process left off previously.
- * The same thing is achieved by addr == (caddr_t) 1
+ * The same thing is achieved by addr == (void *) 1
* on NetBSD, so rewrite 'addr' appropriately.
*/
if (request == LINUX_PTRACE_CONT && SCARG(uap, addr)==0)
- SCARG(&pta, addr) = (caddr_t) 1;
+ SCARG(&pta, addr) = (void *) 1;
error = sys_ptrace(l, &pta, retval);
if (error)
@@ -1470,7 +1470,7 @@ linux_sys_ptrace(l, v, retval)
case LINUX_PTRACE_PEEKTEXT:
case LINUX_PTRACE_PEEKDATA:
error = copyout (retval,
- (caddr_t)SCARG(uap, data),
+ (void *)SCARG(uap, data),
sizeof *retval);
*retval = SCARG(uap, data);
break;
@@ -1648,7 +1648,7 @@ linux_sys_getrlimit(l, v, retval)
# endif
} */ *uap = v;
struct proc *p = l->l_proc;
- caddr_t sg = stackgap_init(p, 0);
+ void *sg = stackgap_init(p, 0);
struct sys_getrlimit_args ap;
struct rlimit rl;
# ifdef LINUX_LARGEFILE64
@@ -1686,7 +1686,7 @@ linux_sys_setrlimit(l, v, retval)
# endif
} */ *uap = v;
struct proc *p = l->l_proc;
- caddr_t sg = stackgap_init(p, 0);
+ void *sg = stackgap_init(p, 0);
struct sys_getrlimit_args ap;
struct rlimit rl;
# ifdef LINUX_LARGEFILE64