diff options
| author | christos <christos@NetBSD.org> | 2007-03-04 05:59:00 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2007-03-04 05:59:00 +0000 |
| commit | 53524e44efd7c7176da8dc8190a698b2fe184db1 (patch) | |
| tree | 68b6fb4aee85c3eb0a522cc199c3a3427938828e /sys/compat/linux | |
| parent | 1b20cebad5f8d3582a41d5599641a95247721732 (diff) | |
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/compat/linux')
57 files changed, 481 insertions, 482 deletions
diff --git a/sys/compat/linux/arch/alpha/linux_machdep.c b/sys/compat/linux/arch/alpha/linux_machdep.c index 9871f869417..d6571f2c06b 100644 --- a/sys/compat/linux/arch/alpha/linux_machdep.c +++ b/sys/compat/linux/arch/alpha/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.36 2007/02/09 21:55:18 ad Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.37 2007/03/04 06:01:18 christos Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.36 2007/02/09 21:55:18 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.37 2007/03/04 06:01:18 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -138,11 +138,11 @@ setup_linux_rt_sigframe(struct trapframe *tf, int sig, const sigset_t *mask) if (onstack) sfp = (struct linux_rt_sigframe *) - ((caddr_t)l->l_sigstk.ss_sp + + ((void *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size); else sfp = (struct linux_rt_sigframe *)(alpha_pal_rdusp()); - sfp = (struct linux_rt_sigframe *)((caddr_t)sfp - rndfsize); + sfp = (struct linux_rt_sigframe *)((void *)sfp - rndfsize); #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && (p->p_pid == sigpid)) @@ -189,7 +189,7 @@ setup_linux_rt_sigframe(struct trapframe *tf, int sig, const sigset_t *mask) sendsig_reset(l, sig); mutex_exit(&p->p_smutex); - error = copyout((caddr_t)&sigframe, (caddr_t)sfp, fsize); + error = copyout((void *)&sigframe, (void *)sfp, fsize); mutex_enter(&p->p_smutex); if (error != 0) { @@ -244,11 +244,11 @@ void setup_linux_sigframe(tf, sig, mask) if (onstack) sfp = (struct linux_sigframe *) - ((caddr_t)l->l_sigstk.ss_sp + + ((void *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size); else sfp = (struct linux_sigframe *)(alpha_pal_rdusp()); - sfp = (struct linux_sigframe *)((caddr_t)sfp - rndfsize); + sfp = (struct linux_sigframe *)((void *)sfp - rndfsize); #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && (p->p_pid == sigpid)) @@ -282,7 +282,7 @@ void setup_linux_sigframe(tf, sig, mask) sendsig_reset(l, sig); mutex_exit(&p->p_smutex); - error = copyout((caddr_t)&sigframe, (caddr_t)sfp, fsize); + error = copyout((void *)&sigframe, (void *)sfp, fsize); mutex_enter(&p->p_smutex); if (error != 0) { @@ -457,7 +457,7 @@ linux_sys_rt_sigreturn(l, v, retval) /* * Fetch the frame structure. */ - if (copyin((caddr_t)sfp, &sigframe, + if (copyin((void *)sfp, &sigframe, sizeof(struct linux_rt_sigframe)) != 0) return (EFAULT); @@ -493,7 +493,7 @@ linux_sys_sigreturn(l, v, retval) /* * Fetch the frame structure. */ - if (copyin((caddr_t)sfp, &frame, sizeof(struct linux_sigframe)) != 0) + if (copyin((void *)sfp, &frame, sizeof(struct linux_sigframe)) != 0) return(EFAULT); /* Grab the signal mask. */ @@ -516,7 +516,7 @@ linux_machdepioctl(l, v, retval) struct linux_sys_ioctl_args /* { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; } */ *uap = v; struct sys_ioctl_args bia; u_long com; diff --git a/sys/compat/linux/arch/alpha/linux_syscall.h b/sys/compat/linux/arch/alpha/linux_syscall.h index ac1c583b5fd..464808a2fe8 100644 --- a/sys/compat/linux/arch/alpha/linux_syscall.h +++ b/sys/compat/linux/arch/alpha/linux_syscall.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.h,v 1.61 2006/09/01 21:19:44 matt Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.62 2007/03/04 06:01:18 christos Exp $ */ /* * System call numbers. @@ -103,7 +103,7 @@ /* syscall: "sigpending" ret: "int" args: "linux_old_sigset_t *" */ #define LINUX_SYS_sigpending 52 -/* syscall: "ioctl" ret: "int" args: "int" "u_long" "caddr_t" */ +/* syscall: "ioctl" ret: "int" args: "int" "u_long" "void *" */ #define LINUX_SYS_ioctl 54 /* syscall: "symlink" ret: "int" args: "const char *" "const char *" */ @@ -190,10 +190,10 @@ /* syscall: "getpriority" ret: "int" args: "int" "int" */ #define LINUX_SYS_getpriority 100 -/* syscall: "send" ret: "int" args: "int" "caddr_t" "int" "int" */ +/* syscall: "send" ret: "int" args: "int" "void *" "int" "int" */ #define LINUX_SYS_send 101 -/* syscall: "recv" ret: "int" args: "int" "caddr_t" "int" "int" */ +/* syscall: "recv" ret: "int" args: "int" "void *" "int" "int" */ #define LINUX_SYS_recv 102 /* syscall: "sigreturn" ret: "int" args: "struct linux_sigframe *" */ @@ -208,7 +208,7 @@ /* syscall: "listen" ret: "int" args: "int" "int" */ #define LINUX_SYS_listen 106 -/* syscall: "sigsuspend" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "sigsuspend" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_sigsuspend 111 /* syscall: "sigstack" ret: "int" args: "struct sigstack *" "struct sigstack *" */ @@ -274,7 +274,7 @@ /* syscall: "rmdir" ret: "int" args: "const char *" */ #define LINUX_SYS_rmdir 137 -/* syscall: "getpeername" ret: "int" args: "int" "caddr_t" "int *" */ +/* syscall: "getpeername" ret: "int" args: "int" "void *" "int *" */ #define LINUX_SYS_getpeername 141 /* syscall: "getrlimit" ret: "int" args: "int" "struct orlimit *" */ @@ -286,7 +286,7 @@ /* syscall: "setsid" ret: "int" args: */ #define LINUX_SYS_setsid 147 -/* syscall: "getsockname" ret: "int" args: "int" "caddr_t" "int *" */ +/* syscall: "getsockname" ret: "int" args: "int" "void *" "int *" */ #define LINUX_SYS_getsockname 150 /* syscall: "sigaction" ret: "int" args: "int" "const struct linux_old_sigaction *" "struct linux_old_sigaction *" */ @@ -352,7 +352,7 @@ #else #endif -/* syscall: "msync" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "msync" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_msync 217 /* syscall: "getpgid" ret: "int" args: "int" */ diff --git a/sys/compat/linux/arch/alpha/linux_syscallargs.h b/sys/compat/linux/arch/alpha/linux_syscallargs.h index 13058345575..e8b0f241d1c 100644 --- a/sys/compat/linux/arch/alpha/linux_syscallargs.h +++ b/sys/compat/linux/arch/alpha/linux_syscallargs.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscallargs.h,v 1.60 2006/09/01 21:19:44 matt Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.61 2007/03/04 06:01:18 christos Exp $ */ /* * System call argument lists. @@ -71,7 +71,7 @@ struct osf1_sys_mount_args { syscallarg(int) type; syscallarg(const char *) path; syscallarg(int) flags; - syscallarg(caddr_t) data; + syscallarg(void *) data; }; struct linux_sys_ptrace_args { @@ -92,9 +92,9 @@ struct linux_sys_kill_args { }; struct osf1_sys_set_program_attributes_args { - syscallarg(caddr_t) taddr; + syscallarg(void *) taddr; syscallarg(unsigned long) tsize; - syscallarg(caddr_t) daddr; + syscallarg(void *) daddr; syscallarg(unsigned long) dsize; }; @@ -111,7 +111,7 @@ struct linux_sys_sigpending_args { struct linux_sys_ioctl_args { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; }; struct linux_sys_symlink_args { @@ -197,14 +197,14 @@ struct linux_sys_getpriority_args { struct linux_sys_send_args { syscallarg(int) s; - syscallarg(caddr_t) buf; + syscallarg(void *) buf; syscallarg(int) len; syscallarg(int) flags; }; struct linux_sys_recv_args { syscallarg(int) s; - syscallarg(caddr_t) buf; + syscallarg(void *) buf; syscallarg(int) len; syscallarg(int) flags; }; @@ -228,7 +228,7 @@ struct linux_sys_setsockopt_args { }; struct linux_sys_sigsuspend_args { - syscallarg(caddr_t) restart; + syscallarg(void *) restart; syscallarg(int) oldmask; syscallarg(int) mask; }; @@ -319,7 +319,7 @@ struct osf1_sys_utimes_args { struct linux_sys_getpeername_args { syscallarg(int) fdes; - syscallarg(caddr_t) asa; + syscallarg(void *) asa; syscallarg(int *) alen; }; @@ -335,7 +335,7 @@ struct linux_sys_setrlimit_args { struct linux_sys_getsockname_args { syscallarg(int) fdec; - syscallarg(caddr_t) asa; + syscallarg(void *) asa; syscallarg(int *) alen; }; @@ -387,7 +387,7 @@ struct linux_sys_shmget_args { #endif struct linux_sys_msync_args { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(int) len; syscallarg(int) fl; }; @@ -409,17 +409,17 @@ struct osf1_sys_usleep_thread_args { struct osf1_sys_getsysinfo_args { syscallarg(u_long) op; - syscallarg(caddr_t) buffer; + syscallarg(void *) buffer; syscallarg(u_long) nbytes; - syscallarg(caddr_t) arg; + syscallarg(void *) arg; syscallarg(u_long) flag; }; struct osf1_sys_setsysinfo_args { syscallarg(u_long) op; - syscallarg(caddr_t) buffer; + syscallarg(void *) buffer; syscallarg(u_long) nbytes; - syscallarg(caddr_t) arg; + syscallarg(void *) arg; syscallarg(u_long) flag; }; diff --git a/sys/compat/linux/arch/alpha/syscalls.master b/sys/compat/linux/arch/alpha/syscalls.master index 8f7a42e7ea1..0e01e171ccf 100644 --- a/sys/compat/linux/arch/alpha/syscalls.master +++ b/sys/compat/linux/arch/alpha/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.56 2007/02/09 21:55:18 ad Exp $ + $NetBSD: syscalls.master,v 1.57 2007/03/04 06:01:18 christos Exp $ ; ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -110,7 +110,7 @@ int whence); } 20 NOARGS { pid_t sys_getpid_with_ppid(void); } 21 NODEF { int osf1_sys_mount(int type, const char *path, \ - int flags, caddr_t data); } + int flags, void *data); } 22 UNIMPL umount 23 NOARGS { int sys_setuid(uid_t uid); } 24 NOARGS { uid_t sys_getuid_with_euid(void); } @@ -134,8 +134,8 @@ 41 NOARGS { int sys_dup(int fd); } 42 NOARGS { int linux_sys_pipe(void); } 43 NODEF { int osf1_sys_set_program_attributes( \ - caddr_t taddr, unsigned long tsize, \ - caddr_t daddr, unsigned long dsize); } + void *taddr, unsigned long tsize, \ + void *daddr, unsigned long dsize); } 44 UNIMPL 45 STD { int linux_sys_open(const char *path, int flags, int mode); } 46 UNIMPL @@ -150,7 +150,7 @@ 52 STD { int linux_sys_sigpending(linux_old_sigset_t *set); } 53 UNIMPL 54 STD { int linux_sys_ioctl(int fd, u_long com, \ - caddr_t data); } + void *data); } 55 UNIMPL 56 UNIMPL 57 STD { int linux_sys_symlink(const char *path, const char *to); } @@ -215,9 +215,9 @@ struct osockaddr *name, int *anamelen); } ;100 ALIAS osf1_sys_getpriority 100 STD { int linux_sys_getpriority(int which, int who); } -101 STD { int linux_sys_send(int s, caddr_t buf, int len, \ +101 STD { int linux_sys_send(int s, void *buf, int len, \ int flags); } -102 STD { int linux_sys_recv(int s, caddr_t buf, int len, \ +102 STD { int linux_sys_recv(int s, void *buf, int len, \ int flags); } 103 STD { int linux_sys_sigreturn(struct linux_sigframe *sfp); } 104 STD { int linux_sys_bind(int s, \ @@ -231,7 +231,7 @@ 109 UNIMPL 110 UNIMPL -111 STD { int linux_sys_sigsuspend(caddr_t restart, \ +111 STD { int linux_sys_sigsuspend(void *restart, \ int oldmask, int mask); } ;112 ALIAS osf1_sys_sigstack 112 NOARGS { int compat_43_sys_sigstack(struct sigstack *nss, \ @@ -278,7 +278,7 @@ 139 UNIMPL 140 UNIMPL 141 STD { int linux_sys_getpeername(int fdes, \ - caddr_t asa, int *alen); } + void *asa, int *alen); } 142 UNIMPL 143 UNIMPL 144 STD { int linux_sys_getrlimit(int which, \ @@ -290,7 +290,7 @@ 148 UNIMPL quotactl 149 UNIMPL 150 STD { int linux_sys_getsockname(int fdec, \ - caddr_t asa, int *alen); } + void *asa, int *alen); } 151 UNIMPL 152 UNIMPL 153 UNIMPL @@ -397,7 +397,7 @@ 214 UNIMPL 215 UNIMPL 216 UNIMPL -217 STD { int linux_sys_msync(caddr_t addr, int len, int fl); } +217 STD { int linux_sys_msync(void *addr, int len, int fl); } 218 UNIMPL 219 UNIMPL 220 UNIMPL @@ -438,10 +438,10 @@ 253 UNIMPL 254 UNIMPL 255 UNIMPL sysfs -256 NODEF { int osf1_sys_getsysinfo(u_long op, caddr_t buffer, \ - u_long nbytes, caddr_t arg, u_long flag); } -257 NODEF { int osf1_sys_setsysinfo(u_long op, caddr_t buffer, \ - u_long nbytes, caddr_t arg, u_long flag); } +256 NODEF { int osf1_sys_getsysinfo(u_long op, void *buffer, \ + u_long nbytes, void *arg, u_long flag); } +257 NODEF { int osf1_sys_setsysinfo(u_long op, void *buffer, \ + u_long nbytes, void *arg, u_long flag); } 258 UNIMPL 259 UNIMPL 260 UNIMPL diff --git a/sys/compat/linux/arch/amd64/linux_machdep.c b/sys/compat/linux/arch/amd64/linux_machdep.c index 265761e35ca..dd849b4565b 100644 --- a/sys/compat/linux/arch/amd64/linux_machdep.c +++ b/sys/compat/linux/arch/amd64/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.18 2007/02/17 22:31:41 pavel Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.19 2007/03/04 06:01:18 christos Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.18 2007/02/17 22:31:41 pavel Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.19 2007/03/04 06:01:18 christos Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -141,10 +141,10 @@ linux_sendsig(ksi, mask) /* Allocate space for the signal handler context. */ if (onstack) - sp = ((caddr_t)l->l_sigstk.ss_sp + + sp = ((void *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size); else - sp = (caddr_t)tf->tf_rsp - 128; + sp = (void *)tf->tf_rsp - 128; /* * Save FPU state, if any diff --git a/sys/compat/linux/arch/amd64/linux_syscall.h b/sys/compat/linux/arch/amd64/linux_syscall.h index 4ca8b783c02..62623d1fc51 100644 --- a/sys/compat/linux/arch/amd64/linux_syscall.h +++ b/sys/compat/linux/arch/amd64/linux_syscall.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.h,v 1.16 2006/09/01 21:19:45 matt Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.17 2007/03/04 06:01:18 christos Exp $ */ /* * System call numbers. @@ -43,7 +43,7 @@ /* syscall: "mprotect" ret: "int" args: "const void *" "unsigned long" "int" */ #define LINUX_SYS_mprotect 10 -/* syscall: "munmap" ret: "int" args: "caddr_t" "int" */ +/* syscall: "munmap" ret: "int" args: "void *" "int" */ #define LINUX_SYS_munmap 11 /* syscall: "brk" ret: "int" args: "char *" */ @@ -58,7 +58,7 @@ /* syscall: "rt_sigreturn" ret: "int" args: */ #define LINUX_SYS_rt_sigreturn 15 -/* syscall: "ioctl" ret: "int" args: "int" "u_long" "caddr_t" */ +/* syscall: "ioctl" ret: "int" args: "int" "u_long" "void *" */ #define LINUX_SYS_ioctl 16 /* syscall: "pread" ret: "int" args: "int" "char *" "size_t" "linux_off_t" */ @@ -88,7 +88,7 @@ /* syscall: "mremap" ret: "void *" args: "void *" "size_t" "size_t" "u_long" */ #define LINUX_SYS_mremap 25 -/* syscall: "msync" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "msync" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_msync 26 /* syscall: "mincore" ret: "int" args: "void *" "size_t" "char *" */ @@ -163,7 +163,7 @@ /* syscall: "listen" ret: "int" args: "int" "int" */ #define LINUX_SYS_listen 50 -/* syscall: "getsockname" ret: "int" args: "int" "caddr_t" "int *" */ +/* syscall: "getsockname" ret: "int" args: "int" "void *" "int *" */ #define LINUX_SYS_getsockname 51 /* syscall: "getpeername" ret: "int" args: "int" "struct sockaddr *" "unsigned int *" */ @@ -448,10 +448,10 @@ /* syscall: "sched_get_priority_min" ret: "int" args: "int" */ #define LINUX_SYS_sched_get_priority_min 147 -/* syscall: "mlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "mlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_mlock 149 -/* syscall: "munlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "munlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_munlock 150 /* syscall: "mlockall" ret: "int" args: "int" */ diff --git a/sys/compat/linux/arch/amd64/linux_syscallargs.h b/sys/compat/linux/arch/amd64/linux_syscallargs.h index 5cf0c5433c1..d914bf20b73 100644 --- a/sys/compat/linux/arch/amd64/linux_syscallargs.h +++ b/sys/compat/linux/arch/amd64/linux_syscallargs.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscallargs.h,v 1.16 2006/09/01 21:19:45 matt Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.17 2007/03/04 06:01:19 christos Exp $ */ /* * System call argument lists. @@ -75,7 +75,7 @@ struct linux_sys_rt_sigprocmask_args { struct linux_sys_ioctl_args { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; }; struct linux_sys_pread_args { @@ -117,7 +117,7 @@ struct linux_sys_mremap_args { }; struct linux_sys_msync_args { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(int) len; syscallarg(int) fl; }; @@ -197,7 +197,7 @@ struct linux_sys_bind_args { struct linux_sys_getsockname_args { syscallarg(int) fdec; - syscallarg(caddr_t) asa; + syscallarg(void *) asa; syscallarg(int *) alen; }; diff --git a/sys/compat/linux/arch/amd64/syscalls.master b/sys/compat/linux/arch/amd64/syscalls.master index 6b2d287dcff..5248c87a419 100644 --- a/sys/compat/linux/arch/amd64/syscalls.master +++ b/sys/compat/linux/arch/amd64/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.16 2007/02/09 21:55:18 ad Exp $ + $NetBSD: syscalls.master,v 1.17 2007/03/04 06:01:19 christos Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -77,7 +77,7 @@ linux_off_t offset); } 10 STD { int linux_sys_mprotect(const void *start, \ unsigned long len, int prot); } -11 NOARGS { int sys_munmap(caddr_t addr, int len); } +11 NOARGS { int sys_munmap(void *addr, int len); } 12 STD { int linux_sys_brk(char *nsize); } 13 STD { int linux_sys_rt_sigaction(int signum, \ const struct linux_sigaction *nsa, \ @@ -89,7 +89,7 @@ size_t sigsetsize); } 15 NOARGS { int linux_sys_rt_sigreturn(void); } 16 STD { int linux_sys_ioctl(int fd, u_long com, \ - caddr_t data); } + void *data); } 17 STD { int linux_sys_pread(int fd, char *buf, \ size_t nbyte, linux_off_t offset); } 18 STD { int linux_sys_pwrite(int fd, char *buf, \ @@ -106,7 +106,7 @@ 24 STD { int linux_sys_sched_yield(void); } 25 STD { void *linux_sys_mremap(void *old_address, \ size_t old_size, size_t new_size, u_long flags); } -26 STD { int linux_sys_msync(caddr_t addr, int len, int fl); } +26 STD { int linux_sys_msync(void *addr, int len, int fl); } 27 NOARGS { int sys_mincore(void *addr, size_t len, char *vec); } 28 NOARGS { int sys_madvise(void *addr, size_t len, int behav); } #ifdef SYSVSHM @@ -153,7 +153,7 @@ const struct osockaddr *name, \ unsigned int namelen); } 50 NOARGS { int sys_listen(int s, int backlog); } -51 STD { int linux_sys_getsockname(int fdec, caddr_t asa, \ +51 STD { int linux_sys_getsockname(int fdec, void *asa, \ int *alen); } 52 STD { int linux_sys_getpeername(int fdes, \ struct sockaddr *asa, unsigned int *alen); } @@ -315,8 +315,8 @@ 146 STD { int linux_sys_sched_get_priority_max(int policy); } 147 STD { int linux_sys_sched_get_priority_min(int policy); } 148 UNIMPL sys_sched_rr_get_interval -149 NOARGS { int sys_mlock(caddr_t addr, size_t len); } -150 NOARGS { int sys_munlock(caddr_t addr, size_t len); } +149 NOARGS { int sys_mlock(void *addr, size_t len); } +150 NOARGS { int sys_munlock(void *addr, size_t len); } 151 NOARGS { int sys_mlockall(int flags); } 152 NOARGS { int sys_munlockall(void); } 153 UNIMPL vhangup diff --git a/sys/compat/linux/arch/arm/linux_machdep.c b/sys/compat/linux/arch/arm/linux_machdep.c index 73defd1f666..333eaf5f8a4 100644 --- a/sys/compat/linux/arch/arm/linux_machdep.c +++ b/sys/compat/linux/arch/arm/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.19 2007/02/09 21:55:18 ad Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.20 2007/03/04 06:01:19 christos Exp $ */ /*- * Copyright (c) 1995, 2000 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.19 2007/02/09 21:55:18 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.20 2007/03/04 06:01:19 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -109,7 +109,7 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) /* Allocate space for the signal handler context. */ if (onstack) - fp = (struct linux_sigframe *)((caddr_t)l->l_sigstk.ss_sp + + fp = (struct linux_sigframe *)((void *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size); else fp = (struct linux_sigframe *)tf->tf_usr_sp; @@ -224,7 +224,7 @@ linux_sys_sigreturn(l, v, retval) * program jumps out of a signal handler. */ sfp = (struct linux_sigframe *)tf->tf_usr_sp; - if (copyin((caddr_t)sfp, &frame, sizeof(*sfp)) != 0) + if (copyin((void *)sfp, &frame, sizeof(*sfp)) != 0) return (EFAULT); /* @@ -293,7 +293,7 @@ linux_machdepioctl(l, v, retval) struct linux_sys_ioctl_args /* { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; } */ *uap = v; struct sys_ioctl_args bia; u_long com; diff --git a/sys/compat/linux/arch/arm/linux_ptrace.c b/sys/compat/linux/arch/arm/linux_ptrace.c index 952c4623c43..08456d7ab17 100644 --- a/sys/compat/linux/arch/arm/linux_ptrace.c +++ b/sys/compat/linux/arch/arm/linux_ptrace.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ptrace.c,v 1.8 2007/02/19 01:19:16 ad Exp $ */ +/* $NetBSD: linux_ptrace.c,v 1.9 2007/03/04 06:01:19 christos Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.8 2007/02/19 01:19:16 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.9 2007/03/04 06:01:19 christos Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -181,7 +181,7 @@ linux_sys_ptrace_arch(l, v, retval) linux_regs->uregs[LINUX_REG_CPSR] = regs->r_cpsr; linux_regs->uregs[LINUX_REG_ORIG_R0] = regs->r[0]; - error = copyout(linux_regs, (caddr_t)SCARG(uap, data), + error = copyout(linux_regs, (void *)SCARG(uap, data), sizeof(struct linux_reg)); goto out; @@ -190,7 +190,7 @@ linux_sys_ptrace_arch(l, v, retval) MALLOC(linux_regs, struct linux_reg *, sizeof(struct linux_reg), M_TEMP, M_WAITOK); - error = copyin((caddr_t)SCARG(uap, data), linux_regs, + error = copyin((void *)SCARG(uap, data), linux_regs, sizeof(struct linux_reg)); if (error != 0) goto out; diff --git a/sys/compat/linux/arch/arm/linux_syscall.h b/sys/compat/linux/arch/arm/linux_syscall.h index ef00be76740..3691b267acf 100644 --- a/sys/compat/linux/arch/arm/linux_syscall.h +++ b/sys/compat/linux/arch/arm/linux_syscall.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.h,v 1.28 2006/09/01 21:19:44 matt Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.29 2007/03/04 06:01:19 christos Exp $ */ /* * System call numbers. @@ -148,7 +148,7 @@ #define LINUX_SYS_acct 51 /* 53 is obsolete lock */ -/* syscall: "ioctl" ret: "int" args: "int" "u_long" "caddr_t" */ +/* syscall: "ioctl" ret: "int" args: "int" "u_long" "void *" */ #define LINUX_SYS_ioctl 54 /* syscall: "fcntl" ret: "int" args: "int" "int" "void *" */ @@ -195,7 +195,7 @@ /* syscall: "setregid" ret: "int" args: "gid_t" "gid_t" */ #define LINUX_SYS_setregid 71 -/* syscall: "sigsuspend" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "sigsuspend" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_sigsuspend 72 /* syscall: "sigpending" ret: "int" args: "linux_old_sigset_t *" */ @@ -250,13 +250,13 @@ /* syscall: "reboot" ret: "int" args: "int" "int" "int" "void *" */ #define LINUX_SYS_reboot 88 -/* syscall: "readdir" ret: "int" args: "int" "caddr_t" "unsigned int" */ +/* syscall: "readdir" ret: "int" args: "int" "void *" "unsigned int" */ #define LINUX_SYS_readdir 89 /* syscall: "old_mmap" ret: "int" args: "struct linux_oldmmap *" */ #define LINUX_SYS_old_mmap 90 -/* syscall: "munmap" ret: "int" args: "caddr_t" "int" */ +/* syscall: "munmap" ret: "int" args: "void *" "int" */ #define LINUX_SYS_munmap 91 /* syscall: "truncate" ret: "int" args: "const char *" "long" */ @@ -277,7 +277,7 @@ /* syscall: "setpriority" ret: "int" args: "int" "int" "int" */ #define LINUX_SYS_setpriority 97 -/* syscall: "profil" ret: "int" args: "caddr_t" "u_int" "u_int" "u_int" */ +/* syscall: "profil" ret: "int" args: "void *" "u_int" "u_int" "u_int" */ #define LINUX_SYS_profil 98 /* syscall: "statfs" ret: "int" args: "const char *" "struct linux_statfs *" */ @@ -316,7 +316,7 @@ /* syscall: "sysinfo" ret: "int" args: "struct linux_sysinfo *" */ #define LINUX_SYS_sysinfo 116 -/* syscall: "ipc" ret: "int" args: "int" "int" "int" "int" "caddr_t" */ +/* syscall: "ipc" ret: "int" args: "int" "int" "int" "int" "void *" */ #define LINUX_SYS_ipc 117 /* syscall: "fsync" ret: "int" args: "int" */ @@ -355,7 +355,7 @@ /* syscall: "getfsuid" ret: "int" args: */ #define LINUX_SYS_getfsuid 139 -/* syscall: "llseek" ret: "int" args: "int" "u_int32_t" "u_int32_t" "caddr_t" "int" */ +/* syscall: "llseek" ret: "int" args: "int" "u_int32_t" "u_int32_t" "void *" "int" */ #define LINUX_SYS_llseek 140 /* syscall: "getdents" ret: "int" args: "int" "struct linux_dirent *" "unsigned int" */ @@ -367,7 +367,7 @@ /* syscall: "flock" ret: "int" args: "int" "int" */ #define LINUX_SYS_flock 143 -/* syscall: "msync" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "msync" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_msync 144 /* syscall: "readv" ret: "int" args: "int" "struct iovec *" "u_int" */ @@ -385,10 +385,10 @@ /* syscall: "__sysctl" ret: "int" args: "struct linux___sysctl *" */ #define LINUX_SYS___sysctl 149 -/* syscall: "mlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "mlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_mlock 150 -/* syscall: "munlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "munlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_munlock 151 /* syscall: "mlockall" ret: "int" args: "int" */ diff --git a/sys/compat/linux/arch/arm/linux_syscallargs.h b/sys/compat/linux/arch/arm/linux_syscallargs.h index dd1c4ffd5cd..5da05252052 100644 --- a/sys/compat/linux/arch/arm/linux_syscallargs.h +++ b/sys/compat/linux/arch/arm/linux_syscallargs.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscallargs.h,v 1.28 2006/09/01 21:19:44 matt Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.29 2007/03/04 06:01:19 christos Exp $ */ /* * System call argument lists. @@ -152,7 +152,7 @@ struct linux_sys_signal_args { struct linux_sys_ioctl_args { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; }; struct linux_sys_fcntl_args { @@ -176,7 +176,7 @@ struct linux_sys_sigsetmask_args { }; struct linux_sys_sigsuspend_args { - syscallarg(caddr_t) restart; + syscallarg(void *) restart; syscallarg(int) oldmask; syscallarg(int) mask; }; @@ -240,7 +240,7 @@ struct linux_sys_reboot_args { struct linux_sys_readdir_args { syscallarg(int) fd; - syscallarg(caddr_t) dent; + syscallarg(void *) dent; syscallarg(unsigned int) count; }; @@ -318,7 +318,7 @@ struct linux_sys_ipc_args { syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; }; struct linux_sys_sigreturn_args { @@ -367,7 +367,7 @@ struct linux_sys_llseek_args { syscallarg(int) fd; syscallarg(u_int32_t) ohigh; syscallarg(u_int32_t) olow; - syscallarg(caddr_t) res; + syscallarg(void *) res; syscallarg(int) whence; }; @@ -386,7 +386,7 @@ struct linux_sys_select_args { }; struct linux_sys_msync_args { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(int) len; syscallarg(int) fl; }; diff --git a/sys/compat/linux/arch/arm/syscalls.master b/sys/compat/linux/arch/arm/syscalls.master index 4985e6c2177..100a976b4e5 100644 --- a/sys/compat/linux/arch/arm/syscalls.master +++ b/sys/compat/linux/arch/arm/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.27 2007/02/09 21:55:18 ad Exp $ + $NetBSD: syscalls.master,v 1.28 2007/03/04 06:01:19 christos Exp $ ; Derived from sys/compat/linux/arch/*/syscalls.master ; and from Linux 2.4.12 arch/arm/kernel/calls.S @@ -121,7 +121,7 @@ 52 UNIMPL umount 53 OBSOL lock 54 STD { int linux_sys_ioctl(int fd, u_long com, \ - caddr_t data); } + void *data); } 55 STD { int linux_sys_fcntl(int fd, int cmd, void *arg); } 56 OBSOL mpx 57 NOARGS { int sys_setpgid(int pid, int pgid); } @@ -142,7 +142,7 @@ 69 STD { int linux_sys_sigsetmask(linux_old_sigset_t mask); } 70 NOARGS { int sys_setreuid(uid_t ruid, uid_t euid); } 71 NOARGS { int sys_setregid(gid_t rgid, gid_t egid); } -72 STD { int linux_sys_sigsuspend(caddr_t restart, \ +72 STD { int linux_sys_sigsuspend(void *restart, \ int oldmask, int mask); } 73 STD { int linux_sys_sigpending(linux_old_sigset_t *set); } 74 NOARGS { int compat_43_sys_sethostname(char *hostname, \ @@ -173,10 +173,10 @@ 87 STD { int linux_sys_swapon(char *name); } 88 STD { int linux_sys_reboot(int magic1, int magic2, \ int cmd, void *arg); } -89 STD { int linux_sys_readdir(int fd, caddr_t dent, \ +89 STD { int linux_sys_readdir(int fd, void *dent, \ unsigned int count); } 90 STD { int linux_sys_old_mmap(struct linux_oldmmap *lmp); } -91 NOARGS { int sys_munmap(caddr_t addr, int len); } +91 NOARGS { int sys_munmap(void *addr, int len); } 92 STD { int linux_sys_truncate(const char *path, \ long length); } 93 NOARGS { int compat_43_sys_ftruncate(int fd, long length); } @@ -184,7 +184,7 @@ 95 STD { int linux_sys_fchown16(int fd, int uid, int gid); } 96 STD { int linux_sys_getpriority(int which, int who); } 97 NOARGS { int sys_setpriority(int which, int who, int prio); } -98 NOARGS { int sys_profil(caddr_t samples, u_int size, \ +98 NOARGS { int sys_profil(void *samples, u_int size, \ u_int offset, u_int scale); } 99 STD { int linux_sys_statfs(const char *path, \ struct linux_statfs *sp); } @@ -212,7 +212,7 @@ 115 STD { int linux_sys_swapoff(const char *path); } 116 STD { int linux_sys_sysinfo(struct linux_sysinfo *arg); } 117 STD { int linux_sys_ipc(int what, int a1, int a2, int a3, \ - caddr_t ptr); } + void *ptr); } 118 NOARGS { int sys_fsync(int fd); } 119 STD { int linux_sys_sigreturn(struct linux_sigcontext *scp); } 120 STD { int linux_sys_clone(int flags, void *stack); } @@ -240,14 +240,14 @@ 138 STD { int linux_sys_setfsuid(uid_t uid); } 139 NOARGS { int linux_sys_getfsuid(void); } 140 STD { int linux_sys_llseek(int fd, u_int32_t ohigh, \ - u_int32_t olow, caddr_t res, int whence); } + u_int32_t olow, void *res, int whence); } 141 STD { int linux_sys_getdents(int fd, \ struct linux_dirent *dent, unsigned int count); } 142 STD { int linux_sys_select(int nfds, fd_set *readfds, \ fd_set *writefds, fd_set *exceptfds, \ struct timeval *timeout); } 143 NOARGS { int sys_flock(int fd, int how); } -144 STD { int linux_sys_msync(caddr_t addr, int len, int fl); } +144 STD { int linux_sys_msync(void *addr, int len, int fl); } 145 NOARGS { int sys_readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 146 NOARGS { int sys_writev(int fd, struct iovec *iovp, \ @@ -255,8 +255,8 @@ 147 NOARGS { pid_t sys_getsid(pid_t pid); } 148 STD { int linux_sys_fdatasync(int fd); } 149 STD { int linux_sys___sysctl(struct linux___sysctl *lsp); } -150 NOARGS { int sys_mlock(caddr_t addr, size_t len); } -151 NOARGS { int sys_munlock(caddr_t addr, size_t len); } +150 NOARGS { int sys_mlock(void *addr, size_t len); } +151 NOARGS { int sys_munlock(void *addr, size_t len); } 152 NOARGS { int sys_mlockall(int flags); } 153 NOARGS { int sys_munlockall(void); } 154 STD { int linux_sys_sched_setparam(pid_t pid, \ diff --git a/sys/compat/linux/arch/i386/linux_machdep.c b/sys/compat/linux/arch/i386/linux_machdep.c index 3fdd91dbf89..28e9677c07d 100644 --- a/sys/compat/linux/arch/i386/linux_machdep.c +++ b/sys/compat/linux/arch/i386/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.122 2007/02/09 21:55:18 ad Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.123 2007/03/04 06:01:19 christos Exp $ */ /*- * Copyright (c) 1995, 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.122 2007/02/09 21:55:18 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.123 2007/03/04 06:01:19 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_vm86.h" @@ -288,7 +288,7 @@ linux_rt_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) /* Allocate space for the signal handler context. */ if (onstack) - fp = (struct linux_rt_sigframe *)((caddr_t)sas->ss_sp + + fp = (struct linux_rt_sigframe *)((char *)sas->ss_sp + sas->ss_size); else fp = (struct linux_rt_sigframe *)tf->tf_esp; @@ -398,7 +398,7 @@ linux_old_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) /* Allocate space for the signal handler context. */ if (onstack) - fp = (struct linux_sigframe *) ((caddr_t)sas->ss_sp + + fp = (struct linux_sigframe *) ((char *)sas->ss_sp + sas->ss_size); else fp = (struct linux_sigframe *)tf->tf_esp; @@ -496,7 +496,7 @@ linux_sys_sigreturn(l, v, retval) * It is unsafe to keep track of it ourselves, in the event that a * program jumps out of a signal handler. */ - if ((error = copyin((caddr_t)scp, &context, sizeof(*scp))) != 0) + if ((error = copyin((void *)scp, &context, sizeof(*scp))) != 0) return error; return linux_restore_sigcontext(l, &context, retval); } @@ -565,8 +565,7 @@ linux_restore_sigcontext(struct lwp *l, struct linux_sigcontext *scp, * to save the onstack flag. */ mutex_enter(&p->p_smutex); - ss_gap = (ssize_t) - ((caddr_t) scp->sc_esp_at_signal - (caddr_t) sas->ss_sp); + ss_gap = (ssize_t)((char *)scp->sc_esp_at_signal - (char *)sas->ss_sp); if (ss_gap >= 0 && ss_gap < sas->ss_size) sas->ss_flags |= SS_ONSTACK; else @@ -596,7 +595,7 @@ linux_read_ldt(l, uap, retval) struct proc *p = l->l_proc; struct i386_get_ldt_args gl; int error; - caddr_t sg; + void *sg; char *parms; DPRINTF(("linux_read_ldt!")); @@ -645,7 +644,7 @@ linux_write_ldt(l, uap, retval) struct segment_descriptor sd; struct i386_set_ldt_args sl; int error; - caddr_t sg; + void *sg; char *parms; int oldmode = (int)retval[0]; @@ -898,14 +897,14 @@ linux_machdepioctl(l, v, retval) struct linux_sys_ioctl_args /* { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; } */ *uap = v; struct sys_ioctl_args bia; u_long com; int error, error1; #if (NWSDISPLAY > 0) struct vt_mode lvt; - caddr_t bvtp, sg; + void *bvtp, *sg; struct kbentry kbe; #endif struct linux_hd_geometry hdg; @@ -943,11 +942,11 @@ linux_machdepioctl(l, v, retval) case LINUX_KDSKBMODE: com = KDSKBMODE; if ((unsigned)SCARG(uap, data) == LINUX_K_MEDIUMRAW) - SCARG(&bia, data) = (caddr_t)K_RAW; + SCARG(&bia, data) = (void *)K_RAW; break; case LINUX_KIOCSOUND: SCARG(&bia, data) = - (caddr_t)(((unsigned long)SCARG(&bia, data)) & 0xffff); + (void *)(((unsigned long)SCARG(&bia, data)) & 0xffff); /* fall through */ case LINUX_KDMKTONE: com = KDMKTONE; @@ -979,18 +978,18 @@ linux_machdepioctl(l, v, retval) /* XXX NJWLWP */ if ((error = sys_ioctl(curlwp, &bia, retval))) goto out; - if ((error = copyin(SCARG(uap, data), (caddr_t)&lvt, + if ((error = copyin(SCARG(uap, data), (void *)&lvt, sizeof (struct vt_mode)))) goto out; lvt.relsig = native_to_linux_signo[lvt.relsig]; lvt.acqsig = native_to_linux_signo[lvt.acqsig]; lvt.frsig = native_to_linux_signo[lvt.frsig]; - error = copyout((caddr_t)&lvt, SCARG(uap, data), + error = copyout((void *)&lvt, SCARG(uap, data), sizeof (struct vt_mode)); goto out; case LINUX_VT_SETMODE: com = VT_SETMODE; - if ((error = copyin(SCARG(uap, data), (caddr_t)&lvt, + if ((error = copyin(SCARG(uap, data), (void *)&lvt, sizeof (struct vt_mode)))) goto out; lvt.relsig = linux_to_native_signo[lvt.relsig]; @@ -1057,8 +1056,8 @@ linux_machdepioctl(l, v, retval) */ bip = fd2biosinfo(p, fp); ioctlf = fp->f_ops->fo_ioctl; - error = ioctlf(fp, DIOCGDEFLABEL, (caddr_t)&label, l); - error1 = ioctlf(fp, DIOCGPART, (caddr_t)&partp, l); + error = ioctlf(fp, DIOCGDEFLABEL, (void *)&label, l); + error1 = ioctlf(fp, DIOCGPART, (void *)&partp, l); if (error != 0 && error1 != 0) { error = error1; goto out; @@ -1108,7 +1107,7 @@ linux_machdepioctl(l, v, retval) ioctlf = fp->f_ops->fo_ioctl; pt.com = SCARG(uap, com); pt.data = SCARG(uap, data); - error = ioctlf(fp, PTIOCLINUX, (caddr_t)&pt, l); + error = ioctlf(fp, PTIOCLINUX, (void *)&pt, l); if (error == EJUSTRETURN) { retval[0] = (register_t)pt.data; error = 0; diff --git a/sys/compat/linux/arch/i386/linux_ptrace.c b/sys/compat/linux/arch/i386/linux_ptrace.c index ddabe5cadf4..ec421d1c7ce 100644 --- a/sys/compat/linux/arch/i386/linux_ptrace.c +++ b/sys/compat/linux/arch/i386/linux_ptrace.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ptrace.c,v 1.16 2007/02/09 21:55:18 ad Exp $ */ +/* $NetBSD: linux_ptrace.c,v 1.17 2007/03/04 06:01:19 christos Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.16 2007/02/09 21:55:18 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.17 2007/03/04 06:01:19 christos Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -227,7 +227,7 @@ linux_sys_ptrace_arch(l, v, retval) linux_regs->esp = regs->r_esp; linux_regs->xss = regs->r_ss; - error = copyout(linux_regs, (caddr_t)SCARG(uap, data), + error = copyout(linux_regs, (void *)SCARG(uap, data), sizeof(struct linux_reg)); goto out; @@ -236,7 +236,7 @@ linux_sys_ptrace_arch(l, v, retval) MALLOC(linux_regs, struct linux_reg *, sizeof(struct linux_reg), M_TEMP, M_WAITOK); - error = copyin((caddr_t)SCARG(uap, data), linux_regs, + error = copyin((void *)SCARG(uap, data), linux_regs, sizeof(struct linux_reg)); if (error != 0) goto out; @@ -275,7 +275,7 @@ linux_sys_ptrace_arch(l, v, retval) memcpy(linux_fpregs, fpregs, min(sizeof(struct linux_fpctx), sizeof(struct fpreg))); - error = copyout(linux_fpregs, (caddr_t)SCARG(uap, data), + error = copyout(linux_fpregs, (void *)SCARG(uap, data), sizeof(struct linux_fpctx)); goto out; @@ -284,7 +284,7 @@ linux_sys_ptrace_arch(l, v, retval) M_TEMP, M_WAITOK); MALLOC(linux_fpregs, struct linux_fpctx *, sizeof(struct linux_fpctx), M_TEMP, M_WAITOK); - error = copyin((caddr_t)SCARG(uap, data), linux_fpregs, + error = copyin((void *)SCARG(uap, data), linux_fpregs, sizeof(struct linux_fpctx)); if (error != 0) goto out; diff --git a/sys/compat/linux/arch/i386/linux_syscall.h b/sys/compat/linux/arch/i386/linux_syscall.h index 01816a2bbe1..e2e57a24c4b 100644 --- a/sys/compat/linux/arch/i386/linux_syscall.h +++ b/sys/compat/linux/arch/i386/linux_syscall.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.h,v 1.65 2006/09/01 21:19:45 matt Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.66 2007/03/04 06:01:19 christos Exp $ */ /* * System call numbers. @@ -150,7 +150,7 @@ /* 52 is obsolete phys */ /* 53 is obsolete lock */ -/* syscall: "ioctl" ret: "int" args: "int" "u_long" "caddr_t" */ +/* syscall: "ioctl" ret: "int" args: "int" "u_long" "void *" */ #define LINUX_SYS_ioctl 54 /* syscall: "fcntl" ret: "int" args: "int" "int" "void *" */ @@ -197,7 +197,7 @@ /* syscall: "setregid16" ret: "int" args: "int" "int" */ #define LINUX_SYS_setregid16 71 -/* syscall: "sigsuspend" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "sigsuspend" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_sigsuspend 72 /* syscall: "sigpending" ret: "int" args: "linux_old_sigset_t *" */ @@ -251,13 +251,13 @@ /* syscall: "reboot" ret: "int" args: "int" "int" "int" "void *" */ #define LINUX_SYS_reboot 88 -/* syscall: "readdir" ret: "int" args: "int" "caddr_t" "unsigned int" */ +/* syscall: "readdir" ret: "int" args: "int" "void *" "unsigned int" */ #define LINUX_SYS_readdir 89 /* syscall: "old_mmap" ret: "int" args: "struct linux_oldmmap *" */ #define LINUX_SYS_old_mmap 90 -/* syscall: "munmap" ret: "int" args: "caddr_t" "int" */ +/* syscall: "munmap" ret: "int" args: "void *" "int" */ #define LINUX_SYS_munmap 91 /* syscall: "truncate" ret: "int" args: "const char *" "long" */ @@ -278,7 +278,7 @@ /* syscall: "setpriority" ret: "int" args: "int" "int" "int" */ #define LINUX_SYS_setpriority 97 -/* syscall: "profil" ret: "int" args: "caddr_t" "u_int" "u_int" "u_int" */ +/* syscall: "profil" ret: "int" args: "void *" "u_int" "u_int" "u_int" */ #define LINUX_SYS_profil 98 /* syscall: "statfs" ret: "int" args: "const char *" "struct linux_statfs *" */ @@ -323,7 +323,7 @@ /* syscall: "sysinfo" ret: "int" args: "struct linux_sysinfo *" */ #define LINUX_SYS_sysinfo 116 -/* syscall: "ipc" ret: "int" args: "int" "int" "int" "int" "caddr_t" */ +/* syscall: "ipc" ret: "int" args: "int" "int" "int" "int" "void *" */ #define LINUX_SYS_ipc 117 /* syscall: "fsync" ret: "int" args: "int" */ @@ -365,7 +365,7 @@ /* syscall: "linux_getfsuid16" ret: "int" args: */ #define LINUX_SYS_linux_getfsuid16 139 -/* syscall: "llseek" ret: "int" args: "int" "u_int32_t" "u_int32_t" "caddr_t" "int" */ +/* syscall: "llseek" ret: "int" args: "int" "u_int32_t" "u_int32_t" "void *" "int" */ #define LINUX_SYS_llseek 140 /* syscall: "getdents" ret: "int" args: "int" "struct linux_dirent *" "unsigned int" */ @@ -377,7 +377,7 @@ /* syscall: "flock" ret: "int" args: "int" "int" */ #define LINUX_SYS_flock 143 -/* syscall: "msync" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "msync" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_msync 144 /* syscall: "readv" ret: "int" args: "int" "struct iovec *" "u_int" */ @@ -395,10 +395,10 @@ /* syscall: "__sysctl" ret: "int" args: "struct linux___sysctl *" */ #define LINUX_SYS___sysctl 149 -/* syscall: "mlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "mlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_mlock 150 -/* syscall: "munlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "munlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_munlock 151 /* syscall: "mlockall" ret: "int" args: "int" */ diff --git a/sys/compat/linux/arch/i386/linux_syscallargs.h b/sys/compat/linux/arch/i386/linux_syscallargs.h index d8ae5e02e6e..dd54aef4a88 100644 --- a/sys/compat/linux/arch/i386/linux_syscallargs.h +++ b/sys/compat/linux/arch/i386/linux_syscallargs.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscallargs.h,v 1.65 2006/09/01 21:19:45 matt Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.66 2007/03/04 06:01:19 christos Exp $ */ /* * System call argument lists. @@ -156,7 +156,7 @@ struct linux_sys_signal_args { struct linux_sys_ioctl_args { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; }; struct linux_sys_fcntl_args { @@ -190,7 +190,7 @@ struct linux_sys_setregid16_args { }; struct linux_sys_sigsuspend_args { - syscallarg(caddr_t) restart; + syscallarg(void *) restart; syscallarg(int) oldmask; syscallarg(int) mask; }; @@ -264,7 +264,7 @@ struct linux_sys_reboot_args { struct linux_sys_readdir_args { syscallarg(int) fd; - syscallarg(caddr_t) dent; + syscallarg(void *) dent; syscallarg(unsigned int) count; }; @@ -352,7 +352,7 @@ struct linux_sys_ipc_args { syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; }; struct linux_sys_sigreturn_args { @@ -403,7 +403,7 @@ struct linux_sys_llseek_args { syscallarg(int) fd; syscallarg(u_int32_t) ohigh; syscallarg(u_int32_t) olow; - syscallarg(caddr_t) res; + syscallarg(void *) res; syscallarg(int) whence; }; @@ -422,7 +422,7 @@ struct linux_sys_select_args { }; struct linux_sys_msync_args { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(int) len; syscallarg(int) fl; }; diff --git a/sys/compat/linux/arch/i386/syscalls.master b/sys/compat/linux/arch/i386/syscalls.master index d66b56d26ca..10586dad042 100644 --- a/sys/compat/linux/arch/i386/syscalls.master +++ b/sys/compat/linux/arch/i386/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.81 2007/02/09 21:55:18 ad Exp $ + $NetBSD: syscalls.master,v 1.82 2007/03/04 06:01:21 christos Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -121,7 +121,7 @@ 52 OBSOL phys 53 OBSOL lock 54 STD { int linux_sys_ioctl(int fd, u_long com, \ - caddr_t data); } + void *data); } 55 STD { int linux_sys_fcntl(int fd, int cmd, void *arg); } 56 OBSOL mpx 57 NOARGS { int sys_setpgid(int pid, int pgid); } @@ -142,7 +142,7 @@ 69 STD { int linux_sys_sigsetmask(linux_old_sigset_t mask); } 70 STD { int linux_sys_setreuid16(int ruid, int euid); } 71 STD { int linux_sys_setregid16(int rgid, int egid); } -72 STD { int linux_sys_sigsuspend(caddr_t restart, \ +72 STD { int linux_sys_sigsuspend(void *restart, \ int oldmask, int mask); } 73 STD { int linux_sys_sigpending(linux_old_sigset_t *set); } 74 NOARGS { int compat_43_sys_sethostname(char *hostname, \ @@ -174,10 +174,10 @@ 87 STD { int linux_sys_swapon(char *name); } 88 STD { int linux_sys_reboot(int magic1, int magic2, \ int cmd, void *arg); } -89 STD { int linux_sys_readdir(int fd, caddr_t dent, \ +89 STD { int linux_sys_readdir(int fd, void *dent, \ unsigned int count); } 90 STD { int linux_sys_old_mmap(struct linux_oldmmap *lmp); } -91 NOARGS { int sys_munmap(caddr_t addr, int len); } +91 NOARGS { int sys_munmap(void *addr, int len); } 92 STD { int linux_sys_truncate(const char *path, \ long length); } 93 NOARGS { int compat_43_sys_ftruncate(int fd, long length); } @@ -185,7 +185,7 @@ 95 STD { int linux_sys_fchown16(int fd, int uid, int gid); } 96 STD { int linux_sys_getpriority(int which, int who); } 97 NOARGS { int sys_setpriority(int which, int who, int prio); } -98 NOARGS { int sys_profil(caddr_t samples, u_int size, \ +98 NOARGS { int sys_profil(void *samples, u_int size, \ u_int offset, u_int scale); } 99 STD { int linux_sys_statfs(const char *path, \ struct linux_statfs *sp); } @@ -214,7 +214,7 @@ 115 STD { int linux_sys_swapoff(const char *path); } 116 STD { int linux_sys_sysinfo(struct linux_sysinfo *arg); } 117 STD { int linux_sys_ipc(int what, int a1, int a2, int a3, \ - caddr_t ptr); } + void *ptr); } 118 NOARGS { int sys_fsync(int fd); } 119 STD { int linux_sys_sigreturn(struct linux_sigcontext *scp); } 120 STD { int linux_sys_clone(int flags, void *stack); } @@ -243,14 +243,14 @@ 138 NOARGS linux_setfsuid16 { int linux_sys_setfsuid(uid_t uid); } 139 NOARGS linux_getfsuid16 { int linux_sys_getfsuid(void); } 140 STD { int linux_sys_llseek(int fd, u_int32_t ohigh, \ - u_int32_t olow, caddr_t res, int whence); } + u_int32_t olow, void *res, int whence); } 141 STD { int linux_sys_getdents(int fd, \ struct linux_dirent *dent, unsigned int count); } 142 STD { int linux_sys_select(int nfds, fd_set *readfds, \ fd_set *writefds, fd_set *exceptfds, \ struct timeval *timeout); } 143 NOARGS { int sys_flock(int fd, int how); } -144 STD { int linux_sys_msync(caddr_t addr, int len, int fl); } +144 STD { int linux_sys_msync(void *addr, int len, int fl); } 145 NOARGS { int sys_readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 146 NOARGS { int sys_writev(int fd, struct iovec *iovp, \ @@ -258,8 +258,8 @@ 147 NOARGS { pid_t sys_getsid(pid_t pid); } 148 STD { int linux_sys_fdatasync(int fd); } 149 STD { int linux_sys___sysctl(struct linux___sysctl *lsp); } -150 NOARGS { int sys_mlock(caddr_t addr, size_t len); } -151 NOARGS { int sys_munlock(caddr_t addr, size_t len); } +150 NOARGS { int sys_mlock(void *addr, size_t len); } +151 NOARGS { int sys_munlock(void *addr, size_t len); } 152 NOARGS { int sys_mlockall(int flags); } 153 NOARGS { int sys_munlockall(void); } 154 STD { int linux_sys_sched_setparam(pid_t pid, \ diff --git a/sys/compat/linux/arch/m68k/linux_machdep.c b/sys/compat/linux/arch/m68k/linux_machdep.c index 94a59af44b0..1d41d6557a9 100644 --- a/sys/compat/linux/arch/m68k/linux_machdep.c +++ b/sys/compat/linux/arch/m68k/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.30 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.31 2007/03/04 06:01:21 christos Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.30 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.31 2007/03/04 06:01:21 christos Exp $"); #define COMPAT_LINUX 1 @@ -83,9 +83,9 @@ extern int sigpid; #endif void setup_linux_sigframe __P((struct frame *frame, int sig, - const sigset_t *mask, caddr_t usp)); + const sigset_t *mask, void *usp)); void setup_linux_rt_sigframe __P((struct frame *frame, int sig, - const sigset_t *mask, caddr_t usp, struct lwp *l)); + const sigset_t *mask, void *usp, struct lwp *l)); /* * Deal with some m68k-specific things in the Linux emulation code. @@ -112,7 +112,7 @@ setup_linux_sigframe(frame, sig, mask, usp) struct frame *frame; int sig; const sigset_t *mask; - caddr_t usp; + void *usp; { struct lwp *l = curlwp; struct proc *p = l->l_proc; @@ -279,7 +279,7 @@ setup_linux_rt_sigframe(frame, sig, mask, usp, l) struct frame *frame; int sig; const sigset_t *mask; - caddr_t usp; + void *usp; struct lwp *l; { struct proc *p = l->l_proc; @@ -472,7 +472,7 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) struct frame *frame = (struct frame *)l->l_md.md_regs; int onstack; /* user stack for signal context */ - caddr_t usp = getframe(l, sig, &onstack); + void *usp = getframe(l, sig, &onstack); sig_t catcher = SIGACTION(p, sig).sa_handler; /* Setup the signal frame (and part of the trapframe). */ @@ -537,11 +537,11 @@ linux_sys_sigreturn(l, v, retval) #ifdef DEBUG if (sigdebug & SDB_FOLLOW) printf("linux_sys_sigreturn: pid %d, usp %p\n", - p->p_pid, (caddr_t) usp); + p->p_pid, (void *) usp); #endif /* Grab whole of the sigcontext. */ - if (copyin((caddr_t) usp, &tsigc2, sizeof tsigc2)) { + if (copyin((void *) usp, &tsigc2, sizeof tsigc2)) { bad: mutex_enter(&p->p_smutex); sigexit(l, SIGSEGV); @@ -689,7 +689,7 @@ linux_sys_rt_sigreturn(l, v, retval) * usp + 8 is a pointer to ucontext structure. */ frame = (struct frame *) l->l_md.md_regs; - error = copyin((caddr_t) frame->f_regs[SP] + 8, (void *) &ucp, sizeof(void *)); + error = copyin((void *) frame->f_regs[SP] + 8, (void *) &ucp, sizeof(void *)); if (error || (int) ucp & 1) goto bad; /* error or odd address */ @@ -917,7 +917,7 @@ linux_machdepioctl(l, v, retval) struct linux_sys_ioctl_args /* { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; } */ *uap = v; struct sys_ioctl_args bia; u_long com; diff --git a/sys/compat/linux/arch/m68k/linux_syscall.h b/sys/compat/linux/arch/m68k/linux_syscall.h index 39505e07b72..a86d0de2237 100644 --- a/sys/compat/linux/arch/m68k/linux_syscall.h +++ b/sys/compat/linux/arch/m68k/linux_syscall.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.h,v 1.58 2006/09/01 21:19:45 matt Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.59 2007/03/04 06:01:21 christos Exp $ */ /* * System call numbers. @@ -151,7 +151,7 @@ #define LINUX_SYS_acct 51 /* 53 is obsolete lock */ -/* syscall: "ioctl" ret: "int" args: "int" "u_long" "caddr_t" */ +/* syscall: "ioctl" ret: "int" args: "int" "u_long" "void *" */ #define LINUX_SYS_ioctl 54 /* syscall: "fcntl" ret: "int" args: "int" "int" "void *" */ @@ -195,7 +195,7 @@ /* syscall: "setregid16" ret: "int" args: "int" "int" */ #define LINUX_SYS_setregid16 71 -/* syscall: "sigsuspend" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "sigsuspend" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_sigsuspend 72 /* syscall: "sigpending" ret: "int" args: "linux_old_sigset_t *" */ @@ -255,13 +255,13 @@ /* syscall: "reboot" ret: "int" args: "int" "int" "int" "void *" */ #define LINUX_SYS_reboot 88 -/* syscall: "readdir" ret: "int" args: "int" "caddr_t" "unsigned int" */ +/* syscall: "readdir" ret: "int" args: "int" "void *" "unsigned int" */ #define LINUX_SYS_readdir 89 /* syscall: "old_mmap" ret: "int" args: "struct linux_oldmmap *" */ #define LINUX_SYS_old_mmap 90 -/* syscall: "munmap" ret: "int" args: "caddr_t" "int" */ +/* syscall: "munmap" ret: "int" args: "void *" "int" */ #define LINUX_SYS_munmap 91 /* syscall: "truncate" ret: "int" args: "const char *" "long" */ @@ -285,7 +285,7 @@ /* syscall: "setpriority" ret: "int" args: "int" "int" "int" */ #define LINUX_SYS_setpriority 97 -/* syscall: "profil" ret: "int" args: "caddr_t" "u_int" "u_int" "u_int" */ +/* syscall: "profil" ret: "int" args: "void *" "u_int" "u_int" "u_int" */ #define LINUX_SYS_profil 98 /* syscall: "statfs" ret: "int" args: "const char *" "struct linux_statfs *" */ @@ -321,7 +321,7 @@ /* syscall: "sysinfo" ret: "int" args: "struct linux_sysinfo *" */ #define LINUX_SYS_sysinfo 116 -/* syscall: "ipc" ret: "int" args: "int" "int" "int" "int" "caddr_t" */ +/* syscall: "ipc" ret: "int" args: "int" "int" "int" "int" "void *" */ #define LINUX_SYS_ipc 117 /* syscall: "fsync" ret: "int" args: "int" */ @@ -363,7 +363,7 @@ /* syscall: "linux_getfsuid16" ret: "int" args: */ #define LINUX_SYS_linux_getfsuid16 139 -/* syscall: "llseek" ret: "int" args: "int" "u_int32_t" "u_int32_t" "caddr_t" "int" */ +/* syscall: "llseek" ret: "int" args: "int" "u_int32_t" "u_int32_t" "void *" "int" */ #define LINUX_SYS_llseek 140 /* syscall: "getdents" ret: "int" args: "int" "struct linux_dirent *" "unsigned int" */ @@ -375,7 +375,7 @@ /* syscall: "flock" ret: "int" args: "int" "int" */ #define LINUX_SYS_flock 143 -/* syscall: "msync" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "msync" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_msync 144 /* syscall: "readv" ret: "int" args: "int" "struct iovec *" "u_int" */ @@ -393,10 +393,10 @@ /* syscall: "__sysctl" ret: "int" args: "struct linux___sysctl *" */ #define LINUX_SYS___sysctl 149 -/* syscall: "mlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "mlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_mlock 150 -/* syscall: "munlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "munlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_munlock 151 /* syscall: "mlockall" ret: "int" args: "int" */ diff --git a/sys/compat/linux/arch/m68k/linux_syscallargs.h b/sys/compat/linux/arch/m68k/linux_syscallargs.h index 5bc0214ed08..b26a7601a65 100644 --- a/sys/compat/linux/arch/m68k/linux_syscallargs.h +++ b/sys/compat/linux/arch/m68k/linux_syscallargs.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscallargs.h,v 1.57 2006/09/01 21:19:45 matt Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.58 2007/03/04 06:01:21 christos Exp $ */ /* * System call argument lists. @@ -155,7 +155,7 @@ struct linux_sys_signal_args { struct linux_sys_ioctl_args { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; }; struct linux_sys_fcntl_args { @@ -185,7 +185,7 @@ struct linux_sys_setregid16_args { }; struct linux_sys_sigsuspend_args { - syscallarg(caddr_t) restart; + syscallarg(void *) restart; syscallarg(int) oldmask; syscallarg(int) mask; }; @@ -265,7 +265,7 @@ struct linux_sys_reboot_args { struct linux_sys_readdir_args { syscallarg(int) fd; - syscallarg(caddr_t) dent; + syscallarg(void *) dent; syscallarg(unsigned int) count; }; @@ -342,7 +342,7 @@ struct linux_sys_ipc_args { syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; }; struct linux_sys_clone_args { @@ -390,7 +390,7 @@ struct linux_sys_llseek_args { syscallarg(int) fd; syscallarg(u_int32_t) ohigh; syscallarg(u_int32_t) olow; - syscallarg(caddr_t) res; + syscallarg(void *) res; syscallarg(int) whence; }; @@ -409,7 +409,7 @@ struct linux_sys_select_args { }; struct linux_sys_msync_args { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(int) len; syscallarg(int) fl; }; diff --git a/sys/compat/linux/arch/m68k/syscalls.master b/sys/compat/linux/arch/m68k/syscalls.master index c3ecd58e3ab..482ec49bad4 100644 --- a/sys/compat/linux/arch/m68k/syscalls.master +++ b/sys/compat/linux/arch/m68k/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.53 2007/02/09 21:55:19 ad Exp $ + $NetBSD: syscalls.master,v 1.54 2007/03/04 06:01:22 christos Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -125,7 +125,7 @@ 52 UNIMPL umount 53 OBSOL lock 54 STD { int linux_sys_ioctl(int fd, u_long com, \ - caddr_t data); } + void *data); } 55 STD { int linux_sys_fcntl(int fd, int cmd, void *arg); } 56 OBSOL mpx 57 NOARGS { int sys_setpgid(int pid, int pgid); } @@ -145,7 +145,7 @@ 69 STD { int linux_sys_sigsetmask(linux_old_sigset_t mask); } 70 STD { int linux_sys_setreuid16(int ruid, int euid); } 71 STD { int linux_sys_setregid16(int rgid, int egid); } -72 STD { int linux_sys_sigsuspend(caddr_t restart, \ +72 STD { int linux_sys_sigsuspend(void *restart, \ int oldmask, int mask); } 73 STD { int linux_sys_sigpending(linux_old_sigset_t *set); } #if !defined(_KERNEL) || defined(COMPAT_43) @@ -184,10 +184,10 @@ 87 STD { int linux_sys_swapon(char *name); } 88 STD { int linux_sys_reboot(int magic1, int magic2, \ int cmd, void *arg); } -89 STD { int linux_sys_readdir(int fd, caddr_t dent, \ +89 STD { int linux_sys_readdir(int fd, void *dent, \ unsigned int count); } 90 STD { int linux_sys_old_mmap(struct linux_oldmmap *lmp); } -91 NOARGS { int sys_munmap(caddr_t addr, int len); } +91 NOARGS { int sys_munmap(void *addr, int len); } 92 STD { int linux_sys_truncate(const char *path, \ long length); } #if !defined(_KERNEL) || defined(COMPAT_43) @@ -199,7 +199,7 @@ 95 STD { int linux_sys_fchown16(int fd, int uid, int gid); } 96 STD { int linux_sys_getpriority(int which, int who); } 97 NOARGS { int sys_setpriority(int which, int who, int prio); } -98 NOARGS { int sys_profil(caddr_t samples, u_int size, \ +98 NOARGS { int sys_profil(void *samples, u_int size, \ u_int offset, u_int scale); } 99 STD { int linux_sys_statfs(const char *path, \ struct linux_statfs *sp); } @@ -227,7 +227,7 @@ 115 STD { int linux_sys_swapoff(const char *path); } 116 STD { int linux_sys_sysinfo(struct linux_sysinfo *arg); } 117 STD { int linux_sys_ipc(int what, int a1, int a2, int a3, \ - caddr_t ptr); } + void *ptr); } 118 NOARGS { int sys_fsync(int fd); } 119 STD { int linux_sys_sigreturn(void); } 120 STD { int linux_sys_clone(int flags, void *stack); } @@ -256,14 +256,14 @@ 138 NOARGS linux_setfsuid16 { int linux_sys_setfsuid(uid_t uid); } 139 NOARGS linux_getfsuid16 { int linux_sys_getfsuid(void); } 140 STD { int linux_sys_llseek(int fd, u_int32_t ohigh, \ - u_int32_t olow, caddr_t res, int whence); } + u_int32_t olow, void *res, int whence); } 141 STD { int linux_sys_getdents(int fd, \ struct linux_dirent *dent, unsigned int count); } 142 STD { int linux_sys_select(int nfds, fd_set *readfds, \ fd_set *writefds, fd_set *exceptfds, \ struct timeval *timeout); } 143 NOARGS { int sys_flock(int fd, int how); } -144 STD { int linux_sys_msync(caddr_t addr, int len, int fl); } +144 STD { int linux_sys_msync(void *addr, int len, int fl); } 145 NOARGS { int sys_readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 146 NOARGS { int sys_writev(int fd, struct iovec *iovp, \ @@ -271,8 +271,8 @@ 147 NOARGS { pid_t sys_getsid(pid_t pid); } 148 STD { int linux_sys_fdatasync(int fd); } 149 STD { int linux_sys___sysctl(struct linux___sysctl *lsp); } -150 NOARGS { int sys_mlock(caddr_t addr, size_t len); } -151 NOARGS { int sys_munlock(caddr_t addr, size_t len); } +150 NOARGS { int sys_mlock(void *addr, size_t len); } +151 NOARGS { int sys_munlock(void *addr, size_t len); } 152 NOARGS { int sys_mlockall(int flags); } 153 NOARGS { int sys_munlockall(void); } 154 STD { int linux_sys_sched_setparam(pid_t pid, \ diff --git a/sys/compat/linux/arch/mips/linux_machdep.c b/sys/compat/linux/arch/mips/linux_machdep.c index 33667839e10..9cb661eac9b 100644 --- a/sys/compat/linux/arch/mips/linux_machdep.c +++ b/sys/compat/linux/arch/mips/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.29 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.30 2007/03/04 06:01:22 christos Exp $ */ /*- * Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.29 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.30 2007/03/04 06:01:22 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -157,7 +157,7 @@ linux_sendsig(ksi, mask) */ if (onstack) fp = (struct linux_sigframe *) - ((caddr_t)l->l_sigstk.ss_sp + ((void *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size); else /* cast for _MIPS_BSD_API == _MIPS_BSD_API_LP32_64CLEAN case */ diff --git a/sys/compat/linux/arch/mips/linux_syscall.h b/sys/compat/linux/arch/mips/linux_syscall.h index 7edf293eb14..57ea38506ab 100644 --- a/sys/compat/linux/arch/mips/linux_syscall.h +++ b/sys/compat/linux/arch/mips/linux_syscall.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.h,v 1.26 2006/06/10 21:16:50 christos Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.27 2007/03/04 06:01:22 christos Exp $ */ /* * System call numbers. @@ -142,7 +142,7 @@ /* syscall: "acct" ret: "int" args: "char *" */ #define LINUX_SYS_acct 51 -/* syscall: "ioctl" ret: "int" args: "int" "u_long" "caddr_t" */ +/* syscall: "ioctl" ret: "int" args: "int" "u_long" "void *" */ #define LINUX_SYS_ioctl 54 /* syscall: "fcntl" ret: "int" args: "int" "int" "void *" */ @@ -188,7 +188,7 @@ /* syscall: "setregid" ret: "int" args: "gid_t" "gid_t" */ #define LINUX_SYS_setregid 71 -/* syscall: "sigsuspend" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "sigsuspend" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_sigsuspend 72 /* syscall: "sigpending" ret: "int" args: "linux_old_sigset_t *" */ @@ -233,13 +233,13 @@ /* syscall: "reboot" ret: "int" args: "int" "int" "int" "void *" */ #define LINUX_SYS_reboot 88 -/* syscall: "readdir" ret: "int" args: "int" "caddr_t" "unsigned int" */ +/* syscall: "readdir" ret: "int" args: "int" "void *" "unsigned int" */ #define LINUX_SYS_readdir 89 /* syscall: "mmap" ret: "int" args: "unsigned long" "size_t" "int" "int" "int" "linux_off_t" */ #define LINUX_SYS_mmap 90 -/* syscall: "munmap" ret: "int" args: "caddr_t" "int" */ +/* syscall: "munmap" ret: "int" args: "void *" "int" */ #define LINUX_SYS_munmap 91 /* syscall: "truncate" ret: "int" args: "const char *" "long" */ @@ -299,7 +299,7 @@ /* syscall: "sysinfo" ret: "int" args: "struct linux_sysinfo *" */ #define LINUX_SYS_sysinfo 116 -/* syscall: "ipc" ret: "int" args: "int" "int" "int" "int" "caddr_t" */ +/* syscall: "ipc" ret: "int" args: "int" "int" "int" "int" "void *" */ #define LINUX_SYS_ipc 117 /* syscall: "fsync" ret: "int" args: "int" */ @@ -338,7 +338,7 @@ /* syscall: "getfsuid" ret: "int" args: */ #define LINUX_SYS_getfsuid 139 -/* syscall: "llseek" ret: "int" args: "int" "u_int32_t" "u_int32_t" "caddr_t" "int" */ +/* syscall: "llseek" ret: "int" args: "int" "u_int32_t" "u_int32_t" "void *" "int" */ #define LINUX_SYS_llseek 140 /* syscall: "getdents" ret: "int" args: "int" "struct linux_dirent *" "unsigned int" */ @@ -350,7 +350,7 @@ /* syscall: "flock" ret: "int" args: "int" "int" */ #define LINUX_SYS_flock 143 -/* syscall: "msync" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "msync" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_msync 144 /* syscall: "readv" ret: "int" args: "int" "struct iovec *" "u_int" */ @@ -374,10 +374,10 @@ /* syscall: "__sysctl" ret: "int" args: "struct linux___sysctl *" */ #define LINUX_SYS___sysctl 153 -/* syscall: "mlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "mlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_mlock 154 -/* syscall: "munlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "munlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_munlock 155 /* syscall: "mlockall" ret: "int" args: "int" */ @@ -422,10 +422,10 @@ /* syscall: "connect" ret: "int" args: "int" "const struct sockaddr *" "int" */ #define LINUX_SYS_connect 170 -/* syscall: "getpeername" ret: "int" args: "int" "caddr_t" "int *" */ +/* syscall: "getpeername" ret: "int" args: "int" "void *" "int *" */ #define LINUX_SYS_getpeername 171 -/* syscall: "getsockname" ret: "int" args: "int" "caddr_t" "int *" */ +/* syscall: "getsockname" ret: "int" args: "int" "void *" "int *" */ #define LINUX_SYS_getsockname 172 /* syscall: "getsockopt" ret: "int" args: "int" "int" "int" "void *" "int *" */ @@ -443,7 +443,7 @@ /* syscall: "recvmsg" ret: "int" args: "int" "struct msghdr *" "u_int" */ #define LINUX_SYS_recvmsg 177 -/* syscall: "send" ret: "int" args: "int" "caddr_t" "int" "int" */ +/* syscall: "send" ret: "int" args: "int" "void *" "int" "int" */ #define LINUX_SYS_send 178 /* syscall: "sendmsg" ret: "int" args: "int" "struct msghdr *" "u_int" */ diff --git a/sys/compat/linux/arch/mips/linux_syscallargs.h b/sys/compat/linux/arch/mips/linux_syscallargs.h index afff52f568f..e3464764ddb 100644 --- a/sys/compat/linux/arch/mips/linux_syscallargs.h +++ b/sys/compat/linux/arch/mips/linux_syscallargs.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscallargs.h,v 1.25 2006/06/10 21:16:50 christos Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.26 2007/03/04 06:01:22 christos Exp $ */ /* * System call argument lists. @@ -152,7 +152,7 @@ struct linux_sys_signal_args { struct linux_sys_ioctl_args { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; }; struct linux_sys_fcntl_args { @@ -176,7 +176,7 @@ struct linux_sys_sigsetmask_args { }; struct linux_sys_sigsuspend_args { - syscallarg(caddr_t) restart; + syscallarg(void *) restart; syscallarg(int) oldmask; syscallarg(int) mask; }; @@ -229,7 +229,7 @@ struct linux_sys_reboot_args { struct linux_sys_readdir_args { syscallarg(int) fd; - syscallarg(caddr_t) dent; + syscallarg(void *) dent; syscallarg(unsigned int) count; }; @@ -303,7 +303,7 @@ struct linux_sys_ipc_args { syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; }; struct linux_sys_sigreturn_args { @@ -352,7 +352,7 @@ struct linux_sys_llseek_args { syscallarg(int) fd; syscallarg(u_int32_t) ohigh; syscallarg(u_int32_t) olow; - syscallarg(caddr_t) res; + syscallarg(void *) res; syscallarg(int) whence; }; @@ -371,7 +371,7 @@ struct linux_sys_select_args { }; struct linux_sys_msync_args { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(int) len; syscallarg(int) fl; }; diff --git a/sys/compat/linux/arch/mips/syscalls.master b/sys/compat/linux/arch/mips/syscalls.master index a70ba5441fa..b75daded2ff 100644 --- a/sys/compat/linux/arch/mips/syscalls.master +++ b/sys/compat/linux/arch/mips/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.22 2007/02/09 21:55:19 ad Exp $ + $NetBSD: syscalls.master,v 1.23 2007/03/04 06:01:22 christos Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -127,7 +127,7 @@ 52 UNIMPL umount 53 UNIMPL 54 STD { int linux_sys_ioctl(int fd, u_long com, \ - caddr_t data); } + void *data); } 55 STD { int linux_sys_fcntl(int fd, int cmd, void *arg); } 56 OBSOL mpx 57 NOARGS { int sys_setpgid(int pid, int pgid); } @@ -148,7 +148,7 @@ 69 STD { int linux_sys_sigsetmask(linux_old_sigset_t mask); } 70 NOARGS { int sys_setreuid(uid_t ruid, uid_t euid); } 71 NOARGS { int sys_setregid(gid_t rgid, gid_t egid); } -72 STD { int linux_sys_sigsuspend(caddr_t restart, \ +72 STD { int linux_sys_sigsuspend(void *restart, \ int oldmask, int mask); } 73 STD { int linux_sys_sigpending(linux_old_sigset_t *set); } 74 NOARGS { int compat_43_sys_sethostname(char *hostname, \ @@ -176,11 +176,11 @@ 87 STD { int linux_sys_swapon(char *name); } 88 STD { int linux_sys_reboot(int magic1, int magic2, \ int cmd, void *arg); } -89 STD { int linux_sys_readdir(int fd, caddr_t dent, \ +89 STD { int linux_sys_readdir(int fd, void *dent, \ unsigned int count); } 90 NOARGS { int linux_sys_mmap(unsigned long addr, size_t len, \ int prot, int flags, int fd, linux_off_t offset); } -91 NOARGS { int sys_munmap(caddr_t addr, int len); } +91 NOARGS { int sys_munmap(void *addr, int len); } 92 STD { int linux_sys_truncate(const char *path, \ long length); } 93 NOARGS { int compat_43_sys_ftruncate(int fd, long length); } @@ -216,7 +216,7 @@ 115 STD { int linux_sys_swapoff(const char *path); } 116 STD { int linux_sys_sysinfo(struct linux_sysinfo *arg); } 117 STD { int linux_sys_ipc(int what, int a1, int a2, int a3, \ - caddr_t ptr); } + void *ptr); } 118 NOARGS { int sys_fsync(int fd); } 119 STD { int linux_sys_sigreturn(struct linux_sigframe *sf); } 120 STD { int linux_sys_clone(int flags, void *stack); } @@ -244,14 +244,14 @@ 138 STD { int linux_sys_setfsuid(uid_t uid); } 139 NOARGS { int linux_sys_getfsuid(void); } 140 STD { int linux_sys_llseek(int fd, u_int32_t ohigh, \ - u_int32_t olow, caddr_t res, int whence); } + u_int32_t olow, void *res, int whence); } 141 STD { int linux_sys_getdents(int fd, \ struct linux_dirent *dent, unsigned int count); } 142 STD { int linux_sys_select(int nfds, fd_set *readfds, \ fd_set *writefds, fd_set *exceptfds, \ struct timeval *timeout); } 143 NOARGS { int sys_flock(int fd, int how); } -144 STD { int linux_sys_msync(caddr_t addr, int len, int fl); } +144 STD { int linux_sys_msync(void *addr, int len, int fl); } 145 NOARGS { int sys_readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 146 NOARGS { int sys_writev(int fd, struct iovec *iovp, \ @@ -265,8 +265,8 @@ 151 NOARGS { pid_t sys_getsid(pid_t pid); } 152 STD { int linux_sys_fdatasync(int fd); } 153 STD { int linux_sys___sysctl(struct linux___sysctl *lsp); } -154 NOARGS { int sys_mlock(caddr_t addr, size_t len); } -155 NOARGS { int sys_munlock(caddr_t addr, size_t len); } +154 NOARGS { int sys_mlock(void *addr, size_t len); } +155 NOARGS { int sys_munlock(void *addr, size_t len); } 156 NOARGS { int sys_mlockall(int flags); } 157 NOARGS { int sys_munlockall(void); } 158 STD { int linux_sys_sched_setparam(pid_t pid, \ @@ -290,9 +290,9 @@ const struct osockaddr *name, int namelen); } 170 NOARGS { int linux_sys_connect(int s, \ const struct sockaddr *name, int namelen); } -171 NOARGS { int linux_sys_getpeername(int fdes, caddr_t asa, \ +171 NOARGS { int linux_sys_getpeername(int fdes, void *asa, \ int *alen); } -172 NOARGS { int linux_sys_getsockname(int fdes, caddr_t asa, \ +172 NOARGS { int linux_sys_getsockname(int fdes, void *asa, \ int *alen); } 173 NOARGS { int linux_sys_getsockopt(int s, int level, \ int optname, void *optval, int *optlen); } @@ -304,7 +304,7 @@ int *fromlenaddr); } 177 NOARGS { int linux_sys_recvmsg(int s, struct msghdr *msg, \ u_int flags); } -178 NOARGS { int linux_sys_send(int s, caddr_t buf, int len, \ +178 NOARGS { int linux_sys_send(int s, void *buf, int len, \ int flags); } 179 NOARGS { int linux_sys_sendmsg(int s, struct msghdr *msg, \ u_int flags); } diff --git a/sys/compat/linux/arch/powerpc/linux_machdep.c b/sys/compat/linux/arch/powerpc/linux_machdep.c index 5bdd2ee8eb0..129da5a9b1c 100644 --- a/sys/compat/linux/arch/powerpc/linux_machdep.c +++ b/sys/compat/linux/arch/powerpc/linux_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.32 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.33 2007/03/04 06:01:22 christos Exp $ */ /*- * Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.32 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.33 2007/03/04 06:01:22 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -150,7 +150,7 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) */ if (onstack) { fp = (register_t) - ((caddr_t)l->l_sigstk.ss_sp + + ((void *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size); } else { fp = tf->fixreg[1]; @@ -213,7 +213,7 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) */ sendsig_reset(l, sig); mutex_exit(&p->p_smutex); - error = copyout(&frame, (caddr_t)fp, sizeof (frame) - LINUX_ABIGAP); + error = copyout(&frame, (void *)fp, sizeof (frame) - LINUX_ABIGAP); if (error != 0) { /* @@ -229,7 +229,7 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) * Add a sigcontext on the stack */ fp -= sizeof(struct linux_sigcontext); - error = copyout(&sc, (caddr_t)fp, sizeof (struct linux_sigcontext)); + error = copyout(&sc, (void *)fp, sizeof (struct linux_sigcontext)); mutex_enter(&p->p_smutex); if (error != 0) { @@ -303,13 +303,13 @@ linux_sys_rt_sigreturn(l, v, retval) /* * Get the context from user stack */ - if (copyin((caddr_t)scp, &sigframe, sizeof(*scp))) + if (copyin((void *)scp, &sigframe, sizeof(*scp))) return (EFAULT); /* * Restore register context. */ - if (copyin((caddr_t)sigframe.luc.luc_context.lregs, + if (copyin((void *)sigframe.luc.luc_context.lregs, &sregs, sizeof(sregs))) return (EFAULT); lregs = (struct linux_pt_regs *)&sregs.lgp_regs; @@ -336,7 +336,7 @@ linux_sys_rt_sigreturn(l, v, retval) */ save_fpu_lwp(curlwp, FPU_DISCARD); - memcpy(curpcb->pcb_fpu.fpreg, (caddr_t)&sregs.lfp_regs, + memcpy(curpcb->pcb_fpu.fpreg, (void *)&sregs.lfp_regs, sizeof(curpcb->pcb_fpu.fpreg)); mutex_enter(&p->p_smutex); @@ -402,7 +402,7 @@ linux_sys_sigreturn(l, v, retval) /* * Restore register context. */ - if (copyin((caddr_t)context.lregs, &sregs, sizeof(sregs))) + if (copyin((void *)context.lregs, &sregs, sizeof(sregs))) return (EFAULT); lregs = (struct linux_pt_regs *)&sregs.lgp_regs; @@ -429,7 +429,7 @@ linux_sys_sigreturn(l, v, retval) */ save_fpu_lwp(curlwp, FPU_DISCARD); - memcpy(curpcb->pcb_fpu.fpreg, (caddr_t)&sregs.lfp_regs, + memcpy(curpcb->pcb_fpu.fpreg, (void *)&sregs.lfp_regs, sizeof(curpcb->pcb_fpu.fpreg)); mutex_enter(&p->p_smutex); @@ -500,7 +500,7 @@ linux_machdepioctl(l, v, retval) struct linux_sys_ioctl_args /* { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; } */ *uap = v; struct sys_ioctl_args bia; u_long com; diff --git a/sys/compat/linux/arch/powerpc/linux_ptrace.c b/sys/compat/linux/arch/powerpc/linux_ptrace.c index fb270f0793b..f0dead50ec2 100644 --- a/sys/compat/linux/arch/powerpc/linux_ptrace.c +++ b/sys/compat/linux/arch/powerpc/linux_ptrace.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ptrace.c,v 1.14 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_ptrace.c,v 1.15 2007/03/04 06:01:22 christos Exp $ */ /*- * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.14 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.15 2007/03/04 06:01:22 christos Exp $"); #include "opt_ptrace.h" @@ -197,7 +197,7 @@ linux_sys_ptrace_arch(l, v, retval) /* XXX Check me! (From NetBSD/i386) */ linux_regs->ldsisr = 0; linux_regs->lresult = 0; - error = copyout(linux_regs, (caddr_t)SCARG(uap, data), + error = copyout(linux_regs, (void *)SCARG(uap, data), sizeof(struct linux_pt_regs)); goto out; @@ -206,7 +206,7 @@ linux_sys_ptrace_arch(l, v, retval) /* XXX Check me! (From NetBSD/i386) */ MALLOC(linux_regs, struct linux_pt_regs*, sizeof(*linux_regs), M_TEMP, M_WAITOK); - error = copyin((caddr_t)SCARG(uap, data), linux_regs, + error = copyin((void *)SCARG(uap, data), linux_regs, sizeof(struct linux_pt_regs)); if (error != 0) goto out; @@ -238,7 +238,7 @@ linux_sys_ptrace_arch(l, v, retval) /* XXX Check me! (From NetBSD/i386) */ memcpy(linux_fpreg, fpregs, min(32*sizeof(double), sizeof(struct fpreg))); - error = copyout(linux_fpreg, (caddr_t)SCARG(uap, data), + error = copyout(linux_fpreg, (void *)SCARG(uap, data), 32*sizeof(double)); goto out; @@ -247,7 +247,7 @@ linux_sys_ptrace_arch(l, v, retval) /* XXX Check me! (From NetBSD/i386) */ M_TEMP, M_WAITOK); MALLOC(linux_fpreg, double *, 32*sizeof(double), M_TEMP, M_WAITOK); - error = copyin((caddr_t)SCARG(uap, data), linux_fpreg, + error = copyin((void *)SCARG(uap, data), linux_fpreg, 32*sizeof(double)); if (error != 0) goto out; @@ -315,7 +315,7 @@ linux_sys_ptrace_arch(l, v, retval) /* XXX Check me! (From NetBSD/i386) */ goto out; error = copyout (retval, - (caddr_t)SCARG(uap, data), sizeof retval); + (void *)SCARG(uap, data), sizeof retval); *retval = SCARG(uap, data); goto out; diff --git a/sys/compat/linux/arch/powerpc/linux_syscall.h b/sys/compat/linux/arch/powerpc/linux_syscall.h index 8c9e417ab44..d4706de3ec4 100644 --- a/sys/compat/linux/arch/powerpc/linux_syscall.h +++ b/sys/compat/linux/arch/powerpc/linux_syscall.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscall.h,v 1.35 2006/09/01 21:19:45 matt Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.36 2007/03/04 06:01:22 christos Exp $ */ /* * System call numbers. @@ -148,7 +148,7 @@ #define LINUX_SYS_acct 51 /* 53 is obsolete lock */ -/* syscall: "ioctl" ret: "int" args: "int" "u_long" "caddr_t" */ +/* syscall: "ioctl" ret: "int" args: "int" "u_long" "void *" */ #define LINUX_SYS_ioctl 54 /* syscall: "fcntl" ret: "int" args: "int" "int" "void *" */ @@ -195,7 +195,7 @@ /* syscall: "setregid" ret: "int" args: "gid_t" "gid_t" */ #define LINUX_SYS_setregid 71 -/* syscall: "sigsuspend" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "sigsuspend" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_sigsuspend 72 /* syscall: "sigpending" ret: "int" args: "linux_old_sigset_t *" */ @@ -249,13 +249,13 @@ /* syscall: "reboot" ret: "int" args: "int" "int" "int" "void *" */ #define LINUX_SYS_reboot 88 -/* syscall: "readdir" ret: "int" args: "int" "caddr_t" "unsigned int" */ +/* syscall: "readdir" ret: "int" args: "int" "void *" "unsigned int" */ #define LINUX_SYS_readdir 89 /* syscall: "mmap" ret: "int" args: "unsigned long" "size_t" "int" "int" "int" "linux_off_t" */ #define LINUX_SYS_mmap 90 -/* syscall: "munmap" ret: "int" args: "caddr_t" "int" */ +/* syscall: "munmap" ret: "int" args: "void *" "int" */ #define LINUX_SYS_munmap 91 /* syscall: "truncate" ret: "int" args: "const char *" "long" */ @@ -276,7 +276,7 @@ /* syscall: "setpriority" ret: "int" args: "int" "int" "int" */ #define LINUX_SYS_setpriority 97 -/* syscall: "profil" ret: "int" args: "caddr_t" "u_int" "u_int" "u_int" */ +/* syscall: "profil" ret: "int" args: "void *" "u_int" "u_int" "u_int" */ #define LINUX_SYS_profil 98 /* syscall: "statfs" ret: "int" args: "const char *" "struct linux_statfs *" */ @@ -318,7 +318,7 @@ /* syscall: "sysinfo" ret: "int" args: "struct linux_sysinfo *" */ #define LINUX_SYS_sysinfo 116 -/* syscall: "ipc" ret: "int" args: "int" "int" "int" "int" "caddr_t" */ +/* syscall: "ipc" ret: "int" args: "int" "int" "int" "int" "void *" */ #define LINUX_SYS_ipc 117 /* syscall: "fsync" ret: "int" args: "int" */ @@ -357,7 +357,7 @@ /* syscall: "getfsuid" ret: "int" args: */ #define LINUX_SYS_getfsuid 139 -/* syscall: "llseek" ret: "int" args: "int" "u_int32_t" "u_int32_t" "caddr_t" "int" */ +/* syscall: "llseek" ret: "int" args: "int" "u_int32_t" "u_int32_t" "void *" "int" */ #define LINUX_SYS_llseek 140 /* syscall: "getdents" ret: "int" args: "int" "struct linux_dirent *" "unsigned int" */ @@ -369,7 +369,7 @@ /* syscall: "flock" ret: "int" args: "int" "int" */ #define LINUX_SYS_flock 143 -/* syscall: "msync" ret: "int" args: "caddr_t" "int" "int" */ +/* syscall: "msync" ret: "int" args: "void *" "int" "int" */ #define LINUX_SYS_msync 144 /* syscall: "readv" ret: "int" args: "int" "struct iovec *" "u_int" */ @@ -387,10 +387,10 @@ /* syscall: "__sysctl" ret: "int" args: "struct linux___sysctl *" */ #define LINUX_SYS___sysctl 149 -/* syscall: "mlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "mlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_mlock 150 -/* syscall: "munlock" ret: "int" args: "caddr_t" "size_t" */ +/* syscall: "munlock" ret: "int" args: "void *" "size_t" */ #define LINUX_SYS_munlock 151 /* syscall: "mlockall" ret: "int" args: "int" */ diff --git a/sys/compat/linux/arch/powerpc/linux_syscallargs.h b/sys/compat/linux/arch/powerpc/linux_syscallargs.h index 556ae9604c5..469295c2b02 100644 --- a/sys/compat/linux/arch/powerpc/linux_syscallargs.h +++ b/sys/compat/linux/arch/powerpc/linux_syscallargs.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_syscallargs.h,v 1.34 2006/09/01 21:19:45 matt Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.35 2007/03/04 06:01:22 christos Exp $ */ /* * System call argument lists. @@ -152,7 +152,7 @@ struct linux_sys_signal_args { struct linux_sys_ioctl_args { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; }; struct linux_sys_fcntl_args { @@ -176,7 +176,7 @@ struct linux_sys_sigsetmask_args { }; struct linux_sys_sigsuspend_args { - syscallarg(caddr_t) restart; + syscallarg(void *) restart; syscallarg(int) oldmask; syscallarg(int) mask; }; @@ -244,7 +244,7 @@ struct linux_sys_reboot_args { struct linux_sys_readdir_args { syscallarg(int) fd; - syscallarg(caddr_t) dent; + syscallarg(void *) dent; syscallarg(unsigned int) count; }; @@ -318,7 +318,7 @@ struct linux_sys_ipc_args { syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; }; struct linux_sys_sigreturn_args { @@ -367,7 +367,7 @@ struct linux_sys_llseek_args { syscallarg(int) fd; syscallarg(u_int32_t) ohigh; syscallarg(u_int32_t) olow; - syscallarg(caddr_t) res; + syscallarg(void *) res; syscallarg(int) whence; }; @@ -386,7 +386,7 @@ struct linux_sys_new_select_args { }; struct linux_sys_msync_args { - syscallarg(caddr_t) addr; + syscallarg(void *) addr; syscallarg(int) len; syscallarg(int) fl; }; diff --git a/sys/compat/linux/arch/powerpc/syscalls.master b/sys/compat/linux/arch/powerpc/syscalls.master index 26d6a451226..21386d98da3 100644 --- a/sys/compat/linux/arch/powerpc/syscalls.master +++ b/sys/compat/linux/arch/powerpc/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.30 2007/02/09 21:55:19 ad Exp $ + $NetBSD: syscalls.master,v 1.31 2007/03/04 06:01:22 christos Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -150,7 +150,7 @@ 52 UNIMPL umount 53 OBSOL lock 54 STD { int linux_sys_ioctl(int fd, u_long com, \ - caddr_t data); } + void *data); } 55 STD { int linux_sys_fcntl(int fd, int cmd, void *arg); } 56 OBSOL mpx 57 NOARGS { int sys_setpgid(int pid, int pgid); } @@ -171,7 +171,7 @@ 69 STD { int linux_sys_sigsetmask(linux_old_sigset_t mask); } 70 NOARGS { int sys_setreuid(uid_t ruid, uid_t euid); } 71 NOARGS { int sys_setregid(gid_t rgid, gid_t egid); } -72 STD { int linux_sys_sigsuspend(caddr_t restart, \ +72 STD { int linux_sys_sigsuspend(void *restart, \ int oldmask, int mask); } 73 STD { int linux_sys_sigpending(linux_old_sigset_t *set); } 74 NOARGS { int compat_43_sys_sethostname(char *hostname, \ @@ -204,11 +204,11 @@ 87 STD { int linux_sys_swapon(char *name); } 88 STD { int linux_sys_reboot(int magic1, int magic2, \ int cmd, void *arg); } -89 STD { int linux_sys_readdir(int fd, caddr_t dent, \ +89 STD { int linux_sys_readdir(int fd, void *dent, \ unsigned int count); } 90 NOARGS { int linux_sys_mmap(unsigned long addr, size_t len, \ int prot, int flags, int fd, linux_off_t offset); } -91 NOARGS { int sys_munmap(caddr_t addr, int len); } +91 NOARGS { int sys_munmap(void *addr, int len); } 92 STD { int linux_sys_truncate(const char *path, \ long length); } 93 NOARGS { int compat_43_sys_ftruncate(int fd, long length); } @@ -216,7 +216,7 @@ 95 NOARGS { int sys___posix_fchown(int fd, int uid, int gid); } 96 STD { int linux_sys_getpriority(int which, int who); } 97 NOARGS { int sys_setpriority(int which, int who, int prio); } -98 NOARGS { int sys_profil(caddr_t samples, u_int size, \ +98 NOARGS { int sys_profil(void *samples, u_int size, \ u_int offset, u_int scale); } 99 STD { int linux_sys_statfs(const char *path, \ struct linux_statfs *sp); } @@ -245,7 +245,7 @@ 115 STD { int linux_sys_swapoff(const char *path); } 116 STD { int linux_sys_sysinfo(struct linux_sysinfo *arg); } 117 STD { int linux_sys_ipc(int what, int a1, int a2, int a3, \ - caddr_t ptr); } + void *ptr); } 118 NOARGS { int sys_fsync(int fd); } 119 STD { int linux_sys_sigreturn(struct linux_sigcontext *scp); } 120 STD { int linux_sys_clone(int flags, void *stack); } @@ -273,14 +273,14 @@ 138 STD { int linux_sys_setfsuid(uid_t uid); } 139 NOARGS { int linux_sys_getfsuid(void); } 140 STD { int linux_sys_llseek(int fd, u_int32_t ohigh, \ - u_int32_t olow, caddr_t res, int whence); } + u_int32_t olow, void *res, int whence); } 141 STD { int linux_sys_getdents(int fd, \ struct linux_dirent *dent, unsigned int count); } 142 STD { int linux_sys_new_select(int nfds, fd_set *readfds, \ fd_set *writefds, fd_set *exceptfds, \ struct timeval *timeout); } 143 NOARGS { int sys_flock(int fd, int how); } -144 STD { int linux_sys_msync(caddr_t addr, int len, int fl); } +144 STD { int linux_sys_msync(void *addr, int len, int fl); } 145 NOARGS { int sys_readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 146 NOARGS { int sys_writev(int fd, struct iovec *iovp, \ @@ -288,8 +288,8 @@ 147 NOARGS { pid_t sys_getsid(pid_t pid); } 148 STD { int linux_sys_fdatasync(int fd); } 149 STD { int linux_sys___sysctl(struct linux___sysctl *lsp); } -150 NOARGS { int sys_mlock(caddr_t addr, size_t len); } -151 NOARGS { int sys_munlock(caddr_t addr, size_t len); } +150 NOARGS { int sys_mlock(void *addr, size_t len); } +151 NOARGS { int sys_munlock(void *addr, size_t len); } 152 NOARGS { int sys_mlockall(int flags); } 153 NOARGS { int sys_munlockall(void); } 154 STD { int linux_sys_sched_setparam(pid_t pid, \ diff --git a/sys/compat/linux/common/linux_blkio.c b/sys/compat/linux/common/linux_blkio.c index 3cc4267f317..1ab4d2931e6 100644 --- a/sys/compat/linux/common/linux_blkio.c +++ b/sys/compat/linux/common/linux_blkio.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_blkio.c,v 1.13 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_blkio.c,v 1.14 2007/03/04 06:01:22 christos Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_blkio.c,v 1.13 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_blkio.c,v 1.14 2007/03/04 06:01:22 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -87,9 +87,9 @@ linux_ioctl_blkio(struct lwp *l, struct linux_sys_ioctl_args *uap, * fails, it may be a disk without label; try to get * the default label and compute the size from it. */ - error = ioctlf(fp, DIOCGPART, (caddr_t)&partp, l); + error = ioctlf(fp, DIOCGPART, (void *)&partp, l); if (error != 0) { - error = ioctlf(fp, DIOCGDEFLABEL, (caddr_t)&label, l); + error = ioctlf(fp, DIOCGDEFLABEL, (void *)&label, l); if (error != 0) break; size = label.d_nsectors * label.d_ntracks * @@ -99,7 +99,7 @@ linux_ioctl_blkio(struct lwp *l, struct linux_sys_ioctl_args *uap, error = copyout(&size, SCARG(uap, data), sizeof size); break; case LINUX_BLKSECTGET: - error = ioctlf(fp, DIOCGDEFLABEL, (caddr_t)&label, l); + error = ioctlf(fp, DIOCGDEFLABEL, (void *)&label, l); if (error != 0) break; error = copyout(&label.d_secsize, SCARG(uap, data), diff --git a/sys/compat/linux/common/linux_cdrom.c b/sys/compat/linux/common/linux_cdrom.c index 1ed44cedfb4..1052ed68d7e 100644 --- a/sys/compat/linux/common/linux_cdrom.c +++ b/sys/compat/linux/common/linux_cdrom.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_cdrom.c,v 1.21 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_cdrom.c,v 1.22 2007/03/04 06:01:23 christos Exp $ */ /* * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_cdrom.c,v 1.21 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_cdrom.c,v 1.22 2007/03/04 06:01:23 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,13 +96,13 @@ linux_ioctl_cdrom(l, uap, retval) struct linux_sys_ioctl_args /* { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; } */ *uap; register_t *retval; { int error, idata; u_long com, ncom; - caddr_t sg; + void *sg; struct file *fp; struct filedesc *fdp; int (*ioctlf)(struct file *, u_long, void *, struct lwp *); @@ -183,7 +183,7 @@ linux_ioctl_cdrom(l, uap, retval) t_msf.end_s = l_msf.cdmsf_sec1; t_msf.end_f = l_msf.cdmsf_frame1; - error = ioctlf(fp, CDIOCPLAYMSF, (caddr_t)&t_msf, l); + error = ioctlf(fp, CDIOCPLAYMSF, (void *)&t_msf, l); break; case LINUX_CDROMPLAYTRKIND: @@ -196,11 +196,11 @@ linux_ioctl_cdrom(l, uap, retval) t_track.end_track = l_ti.cdti_trk1; t_track.end_index = l_ti.cdti_ind1; - error = ioctlf(fp, CDIOCPLAYTRACKS, (caddr_t)&t_track, l); + error = ioctlf(fp, CDIOCPLAYTRACKS, (void *)&t_track, l); break; case LINUX_CDROMREADTOCHDR: - error = ioctlf(fp, CDIOREADTOCHEADER, (caddr_t)&t_header, l); + error = ioctlf(fp, CDIOREADTOCHEADER, (void *)&t_header, l); if (error) break; @@ -223,7 +223,7 @@ linux_ioctl_cdrom(l, uap, retval) t_toc_entry.data_len = sizeof *entry; t_toc_entry.data = entry; - error = ioctlf(fp, CDIOREADTOCENTRIES, (caddr_t)&t_toc_entry, + error = ioctlf(fp, CDIOREADTOCENTRIES, (void *)&t_toc_entry, l); if (error) break; @@ -255,11 +255,11 @@ linux_ioctl_cdrom(l, uap, retval) t_vol.vol[2] = l_volctrl.channel2; t_vol.vol[3] = l_volctrl.channel3; - error = ioctlf(fp, CDIOCSETVOL, (caddr_t)&t_vol, l); + error = ioctlf(fp, CDIOCSETVOL, (void *)&t_vol, l); break; case LINUX_CDROMVOLREAD: - error = ioctlf(fp, CDIOCGETVOL, (caddr_t)&t_vol, l); + error = ioctlf(fp, CDIOCGETVOL, (void *)&t_vol, l); if (error) break; @@ -286,7 +286,7 @@ linux_ioctl_cdrom(l, uap, retval) DPRINTF(("linux_ioctl: CDROMSUBCHNL %d %d\n", l_subchnl.cdsc_format, l_subchnl.cdsc_trk)); - error = ioctlf(fp, CDIOCREADSUBCHANNEL, (caddr_t)&t_subchannel, + error = ioctlf(fp, CDIOCREADSUBCHANNEL, (void *)&t_subchannel, l); if (error) break; @@ -333,7 +333,7 @@ linux_ioctl_cdrom(l, uap, retval) t_blocks.blk = l_blk.from; t_blocks.len = l_blk.len; - error = ioctlf(fp, CDIOCPLAYBLOCKS, (caddr_t)&t_blocks, l); + error = ioctlf(fp, CDIOCPLAYBLOCKS, (void *)&t_blocks, l); break; case LINUX_CDROMEJECT_SW: @@ -377,7 +377,7 @@ linux_ioctl_cdrom(l, uap, retval) if (error) break; - error = ioctlf(fp, CDIOREADTOCHEADER, (caddr_t)&t_header, l); + error = ioctlf(fp, CDIOREADTOCHEADER, (void *)&t_header, l); if (error) break; @@ -389,7 +389,7 @@ linux_ioctl_cdrom(l, uap, retval) t_toc_entry.data = entry; error = ioctlf(fp, CDIOREADTOCENTRIES, - (caddr_t)&t_toc_entry, l); + (void *)&t_toc_entry, l); if (error) break; @@ -442,7 +442,7 @@ linux_ioctl_cdrom(l, uap, retval) error = copyin(SCARG(uap, data), &ds, sizeof ds); if (error) break; - error = ioctlf(fp, DVD_READ_STRUCT, (caddr_t)&ds, l); + error = ioctlf(fp, DVD_READ_STRUCT, (void *)&ds, l); if (error) break; error = copyout(&ds, SCARG(uap, data), sizeof ds); @@ -452,7 +452,7 @@ linux_ioctl_cdrom(l, uap, retval) error = copyin(SCARG(uap, data), &ds, sizeof ds); if (error) break; - error = ioctlf(fp, DVD_WRITE_STRUCT, (caddr_t)&ds, l); + error = ioctlf(fp, DVD_WRITE_STRUCT, (void *)&ds, l); if (error) break; error = copyout(&ds, SCARG(uap, data), sizeof ds); @@ -462,7 +462,7 @@ linux_ioctl_cdrom(l, uap, retval) error = copyin(SCARG(uap, data), &dai, sizeof dai); if (error) break; - error = ioctlf(fp, DVD_AUTH, (caddr_t)&dai, l); + error = ioctlf(fp, DVD_AUTH, (void *)&dai, l); if (error) break; error = copyout(&dai, SCARG(uap, data), sizeof dai); diff --git a/sys/compat/linux/common/linux_emuldata.h b/sys/compat/linux/common/linux_emuldata.h index 481b94b1253..66a5970f5b3 100644 --- a/sys/compat/linux/common/linux_emuldata.h +++ b/sys/compat/linux/common/linux_emuldata.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_emuldata.h,v 1.13 2007/02/05 18:31:36 njoly Exp $ */ +/* $NetBSD: linux_emuldata.h,v 1.14 2007/03/04 06:01:23 christos Exp $ */ /*- * Copyright (c) 1998,2002 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ * structure. */ struct linux_emuldata_shared { - caddr_t p_break; /* Processes' idea of break */ + void * p_break; /* Processes' idea of break */ int refs; pid_t group_pid; /* PID of Linux process (group of threads) */ /* List of Linux threads (NetBSD processes) in the Linux process */ diff --git a/sys/compat/linux/common/linux_exec.c b/sys/compat/linux/common/linux_exec.c index d7e719a62e5..bbcc3a74ce5 100644 --- a/sys/compat/linux/common/linux_exec.c +++ b/sys/compat/linux/common/linux_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec.c,v 1.92 2007/02/19 15:10:03 cube Exp $ */ +/* $NetBSD: linux_exec.c,v 1.93 2007/03/04 06:01:23 christos Exp $ */ /*- * Copyright (c) 1994, 1995, 1998, 2000, 2007 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.92 2007/02/19 15:10:03 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.93 2007/03/04 06:01:23 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -105,7 +105,7 @@ linux_sys_execve(l, v, retval) } */ *uap = v; struct proc *p = l->l_proc; struct sys_execve_args ap; - caddr_t sg; + void *sg; sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); @@ -212,7 +212,7 @@ linux_e_proc_init(p, parent, forkflags) * use our own vmspace. */ vm = (parent) ? parent->p_vmspace : p->p_vmspace; - s->p_break = vm->vm_daddr + ctob(vm->vm_dsize); + s->p_break = (char *)vm->vm_daddr + ctob(vm->vm_dsize); /* * Linux threads are emulated as NetBSD processes (not lwp) diff --git a/sys/compat/linux/common/linux_exec_elf32.c b/sys/compat/linux/common/linux_exec_elf32.c index 82efe4e63db..9031b4769b5 100644 --- a/sys/compat/linux/common/linux_exec_elf32.c +++ b/sys/compat/linux/common/linux_exec_elf32.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec_elf32.c,v 1.77 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_exec_elf32.c,v 1.78 2007/03/04 06:01:23 christos Exp $ */ /*- * Copyright (c) 1995, 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.77 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec_elf32.c,v 1.78 2007/03/04 06:01:23 christos Exp $"); #ifndef ELFSIZE /* XXX should die */ @@ -332,12 +332,12 @@ ELFNAME2(linux,signature)(l, epp, eh, itp) if (np->n_type != ELF_NOTE_TYPE_ABI_TAG || np->n_namesz != ELF_NOTE_ABI_NAMESZ || np->n_descsz != ELF_NOTE_ABI_DESCSZ || - memcmp((caddr_t)(np + 1), ELF_NOTE_ABI_NAME, + memcmp((void *)(np + 1), ELF_NOTE_ABI_NAME, ELF_NOTE_ABI_NAMESZ)) goto next; /* Make sure the OS is Linux. */ - abi = (u_int32_t *)((caddr_t)np + sizeof(Elf_Nhdr) + + abi = (u_int32_t *)((char *)np + sizeof(Elf_Nhdr) + np->n_namesz); if (abi[0] == ELF_NOTE_ABI_OS_LINUX) error = 0; diff --git a/sys/compat/linux/common/linux_fdio.c b/sys/compat/linux/common/linux_fdio.c index 778abfbe823..85e7e3e218b 100644 --- a/sys/compat/linux/common/linux_fdio.c +++ b/sys/compat/linux/common/linux_fdio.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_fdio.c,v 1.9 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_fdio.c,v 1.10 2007/03/04 06:01:23 christos Exp $ */ /* * Copyright (c) 2000 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_fdio.c,v 1.9 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_fdio.c,v 1.10 2007/03/04 06:01:23 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -106,7 +106,7 @@ linux_ioctl_fdio(struct lwp *l, struct linux_sys_ioctl_args *uap, error = copyout(&ldrive, SCARG(uap, data), sizeof ldrive); break; case LINUX_FDGETPRM: - error = ioctlf(fp, FDIOCGETFORMAT, (caddr_t)&fparams, l); + error = ioctlf(fp, FDIOCGETFORMAT, (void *)&fparams, l); if (error != 0) break; lflop.size = fparams.ncyl * fparams.nspt * fparams.ntrk; diff --git a/sys/compat/linux/common/linux_fdio.h b/sys/compat/linux/common/linux_fdio.h index d658ba1f46e..0cba006da05 100644 --- a/sys/compat/linux/common/linux_fdio.h +++ b/sys/compat/linux/common/linux_fdio.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_fdio.h,v 1.3 2005/12/11 12:20:19 christos Exp $ */ +/* $NetBSD: linux_fdio.h,v 1.4 2007/03/04 06:01:23 christos Exp $ */ /* * Copyright (c) 2000 Wasabi Systems, Inc. @@ -138,7 +138,7 @@ struct linux_floppy_write_errors { struct linux_floppy_raw_cmd { u_int flags; void *data; - caddr_t kernel_data; + void *kernel_data; struct floppy_raw_cmd *next; long length; long phys_length; diff --git a/sys/compat/linux/common/linux_file.c b/sys/compat/linux/common/linux_file.c index 35d9517bd38..718a5e1e82c 100644 --- a/sys/compat/linux/common/linux_file.c +++ b/sys/compat/linux/common/linux_file.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_file.c,v 1.78 2007/02/17 21:40:19 dsl Exp $ */ +/* $NetBSD: linux_file.c,v 1.79 2007/03/04 06:01:23 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.78 2007/02/17 21:40:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.79 2007/03/04 06:01:23 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -152,7 +152,7 @@ linux_sys_creat(l, v, retval) } */ *uap = v; struct proc *p = l->l_proc; struct sys_open_args oa; - caddr_t sg; + void *sg; sg = stackgap_init(p, 0); CHECK_ALT_CREAT(l, &sg, SCARG(uap, path)); @@ -184,7 +184,7 @@ linux_sys_open(l, v, retval) struct proc *p = l->l_proc; int error, fl; struct sys_open_args boa; - caddr_t sg; + void *sg; sg = stackgap_init(p, 0); @@ -219,7 +219,7 @@ linux_sys_open(l, v, retval) FILE_USE(fp); if (fp->f_type == DTYPE_VNODE) { (fp->f_ops->fo_ioctl) (fp, TIOCSCTTY, - (caddr_t) 0, l); + (void *) 0, l); } FILE_UNUSE(fp, l); } @@ -299,7 +299,7 @@ linux_sys_fcntl(l, v, retval) struct proc *p = l->l_proc; int fd, cmd, error; u_long val; - caddr_t arg, sg; + void *arg, *sg; struct linux_flock lfl; struct flock *bfp, bfl; struct sys_fcntl_args fca; @@ -314,7 +314,7 @@ linux_sys_fcntl(l, v, retval) fd = SCARG(uap, fd); cmd = SCARG(uap, cmd); - arg = (caddr_t) SCARG(uap, arg); + arg = (void *) SCARG(uap, arg); switch (cmd) { case LINUX_F_DUPFD: @@ -373,7 +373,7 @@ linux_sys_fcntl(l, v, retval) SCARG(&fca, fd) = fd; SCARG(&fca, cmd) = F_SETFL; - SCARG(&fca, arg) = (caddr_t) val; + SCARG(&fca, arg) = (void *) val; error = sys_fcntl(l, &fca, retval); @@ -414,7 +414,7 @@ linux_sys_fcntl(l, v, retval) bfp = (struct flock *) stackgap_alloc(p, &sg, sizeof *bfp); if ((error = copyout(&bfl, bfp, sizeof bfl))) return error; - arg = (caddr_t)bfp; + arg = (void *)bfp; break; case LINUX_F_SETOWN: @@ -546,7 +546,7 @@ linux_sys_fstat(l, v, retval) struct sys___fstat30_args fsa; struct linux_stat tmplst; struct stat *st,tmpst; - caddr_t sg; + void *sg; int error; sg = stackgap_init(p, 0); @@ -581,7 +581,7 @@ linux_stat1(l, v, retval, dolstat) struct linux_stat tmplst; struct stat *st, tmpst; struct proc *p = l->l_proc; - caddr_t sg; + void *sg; int error; struct linux_sys_stat_args *uap = v; @@ -655,7 +655,7 @@ linux_sys_access(l, v, retval) syscallarg(int) flags; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); @@ -673,7 +673,7 @@ linux_sys_unlink(l, v, retval) syscallarg(const char *) path; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); int error; struct nameidata nd; @@ -714,7 +714,7 @@ linux_sys_chdir(l, v, retval) syscallarg(const char *) path; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); @@ -733,7 +733,7 @@ linux_sys_mknod(l, v, retval) syscallarg(int) dev; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_CREAT(l, &sg, SCARG(uap, path)); @@ -773,7 +773,7 @@ linux_sys_chmod(l, v, retval) syscallarg(int) mode; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); @@ -795,7 +795,7 @@ linux_sys_chown16(l, v, retval) } */ *uap = v; struct proc *p = l->l_proc; struct sys___posix_chown_args bca; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); @@ -843,7 +843,7 @@ linux_sys_lchown16(l, v, retval) } */ *uap = v; struct proc *p = l->l_proc; struct sys___posix_lchown_args bla; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_SYMLINK(l, &sg, SCARG(uap, path)); @@ -870,7 +870,7 @@ linux_sys_chown(l, v, retval) syscallarg(int) gid; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); @@ -889,7 +889,7 @@ linux_sys_lchown(l, v, retval) syscallarg(int) gid; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_SYMLINK(l, &sg, SCARG(uap, path)); @@ -908,7 +908,7 @@ linux_sys_rename(l, v, retval) syscallarg(const char *) to; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, from)); CHECK_ALT_CREAT(l, &sg, SCARG(uap, to)); @@ -927,7 +927,7 @@ linux_sys_mkdir(l, v, retval) syscallarg(int) mode; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_CREAT(l, &sg, SCARG(uap, path)); @@ -944,7 +944,7 @@ linux_sys_rmdir(l, v, retval) syscallarg(const char *) path; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); @@ -962,7 +962,7 @@ linux_sys_symlink(l, v, retval) syscallarg(const char *) to; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); CHECK_ALT_CREAT(l, &sg, SCARG(uap, to)); @@ -981,7 +981,7 @@ linux_sys_link(l, v, retval) syscallarg(const char *) link; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); CHECK_ALT_CREAT(l, &sg, SCARG(uap, link)); @@ -1001,7 +1001,7 @@ linux_sys_readlink(l, v, retval) syscallarg(int) count; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_SYMLINK(l, &sg, SCARG(uap, name)); @@ -1020,7 +1020,7 @@ linux_sys_truncate(l, v, retval) syscallarg(long) length; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); diff --git a/sys/compat/linux/common/linux_file64.c b/sys/compat/linux/common/linux_file64.c index 319f5709483..bd52b800028 100644 --- a/sys/compat/linux/common/linux_file64.c +++ b/sys/compat/linux/common/linux_file64.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_file64.c,v 1.35 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_file64.c,v 1.36 2007/03/04 06:01:23 christos Exp $ */ /*- * Copyright (c) 1995, 1998, 2000 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_file64.c,v 1.35 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_file64.c,v 1.36 2007/03/04 06:01:23 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -134,7 +134,7 @@ linux_sys_fstat64(l, v, retval) struct sys___fstat30_args fsa; struct linux_stat64 tmplst; struct stat *st,tmpst; - caddr_t sg; + void *sg; int error; sg = stackgap_init(p, 0); @@ -169,7 +169,7 @@ linux_do_stat64(l, v, retval, dolstat) struct sys___stat30_args sa; struct linux_stat64 tmplst; struct stat *st, tmpst; - caddr_t sg; + void *sg; int error; struct linux_sys_stat64_args *uap = v; @@ -235,7 +235,7 @@ linux_sys_truncate64(l, v, retval) } */ *uap = v; struct sys_truncate_args ta; struct proc *p = l->l_proc; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); @@ -336,7 +336,7 @@ linux_sys_fcntl64(l, v, retval) struct linux_flock64 lfl; struct flock bfl, *bfp; int error; - caddr_t sg; + void *sg; void *arg = SCARG(uap, arg); int cmd = SCARG(uap, cmd); int fd = SCARG(uap, fd); @@ -409,9 +409,9 @@ linux_sys_getdents64(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; @@ -468,7 +468,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; @@ -506,7 +506,7 @@ again: idb.d_off = off; 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; @@ -516,7 +516,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 */ diff --git a/sys/compat/linux/common/linux_hdio.c b/sys/compat/linux/common/linux_hdio.c index 04968aedba6..beb451f0a8e 100644 --- a/sys/compat/linux/common/linux_hdio.c +++ b/sys/compat/linux/common/linux_hdio.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_hdio.c,v 1.11 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_hdio.c,v 1.12 2007/03/04 06:01:23 christos Exp $ */ /* * Copyright (c) 2000 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_hdio.c,v 1.11 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_hdio.c,v 1.12 2007/03/04 06:01:23 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -68,7 +68,7 @@ linux_ioctl_hdio(struct lwp *l, struct linux_sys_ioctl_args *uap, struct proc *p = l->l_proc; u_long com; int error, error1; - caddr_t sg; + void *sg; struct filedesc *fdp; struct file *fp; int (*ioctlf)(struct file *, u_long, void *, struct lwp *); @@ -101,10 +101,10 @@ linux_ioctl_hdio(struct lwp *l, struct linux_sys_ioctl_args *uap, req.flags = ATACMD_READ; req.command = WDCC_IDENTIFY; - req.databuf = (caddr_t)atap; + req.databuf = (void *)atap; req.datalen = DEV_BSIZE; req.timeout = 1000; - error = ioctlf(fp, ATAIOCCOMMAND, (caddr_t)&req, l); + error = ioctlf(fp, ATAIOCCOMMAND, (void *)&req, l); if (error != 0) break; if (req.retsts != ATACMD_OK) @@ -123,8 +123,8 @@ linux_ioctl_hdio(struct lwp *l, struct linux_sys_ioctl_args *uap, error = linux_machdepioctl(l, uap, retval); if (error == 0) break; - error = ioctlf(fp, DIOCGDEFLABEL, (caddr_t)&label, l); - error1 = ioctlf(fp, DIOCGPART, (caddr_t)&partp, l); + error = ioctlf(fp, DIOCGDEFLABEL, (void *)&label, l); + error1 = ioctlf(fp, DIOCGPART, (void *)&partp, l); if (error != 0 && error1 != 0) { error = error1; break; @@ -141,8 +141,8 @@ linux_ioctl_hdio(struct lwp *l, struct linux_sys_ioctl_args *uap, if (error == 0) break; case LINUX_HDIO_GETGEO_BIG_RAW: - error = ioctlf(fp, DIOCGDEFLABEL, (caddr_t)&label, l); - error1 = ioctlf(fp, DIOCGPART, (caddr_t)&partp, l); + error = ioctlf(fp, DIOCGDEFLABEL, (void *)&label, l); + error1 = ioctlf(fp, DIOCGPART, (void *)&partp, l); if (error != 0 && error1 != 0) { error = error1; break; diff --git a/sys/compat/linux/common/linux_ioctl.c b/sys/compat/linux/common/linux_ioctl.c index 33264ff9485..3785273cd59 100644 --- a/sys/compat/linux/common/linux_ioctl.c +++ b/sys/compat/linux/common/linux_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ioctl.c,v 1.46 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_ioctl.c,v 1.47 2007/03/04 06:01:23 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ioctl.c,v 1.46 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ioctl.c,v 1.47 2007/03/04 06:01:23 christos Exp $"); #if defined(_KERNEL_OPT) #include "sequencer.h" @@ -84,7 +84,7 @@ linux_sys_ioctl(l, v, retval) struct linux_sys_ioctl_args /* { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; } */ *uap = v; int error; diff --git a/sys/compat/linux/common/linux_ipc.c b/sys/compat/linux/common/linux_ipc.c index 7abcbb3cc33..0a05b496afa 100644 --- a/sys/compat/linux/common/linux_ipc.c +++ b/sys/compat/linux/common/linux_ipc.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ipc.c,v 1.38 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_ipc.c,v 1.39 2007/03/04 06:01:23 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ipc.c,v 1.38 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ipc.c,v 1.39 2007/03/04 06:01:23 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -338,7 +338,7 @@ linux_sys_msgctl(l, v, retval) syscallarg(struct linux_msqid_ds *) buf; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg; + void *sg; struct sys___msgctl13_args nua; struct msqid_ds *bmp, bm; struct linux_msqid_ds lm; @@ -425,7 +425,7 @@ linux_sys_shmat(l, v, retval) return error; #ifndef __amd64__ - if ((error = copyout(&retval[0], (caddr_t) SCARG(uap, raddr), + if ((error = copyout(&retval[0], (void *) SCARG(uap, raddr), sizeof retval[0]))) return error; @@ -528,7 +528,7 @@ linux_sys_shmctl(l, v, retval) syscallarg(struct linux_shmid_ds *) buf; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg; + void *sg; struct sys___shmctl13_args nua; struct shmid_ds *bsp, bs; struct linux_shmid_ds ls; diff --git a/sys/compat/linux/common/linux_ipccall.c b/sys/compat/linux/common/linux_ipccall.c index 3a8297f6bf6..1c0c57a2531 100644 --- a/sys/compat/linux/common/linux_ipccall.c +++ b/sys/compat/linux/common/linux_ipccall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ipccall.c,v 1.27 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_ipccall.c,v 1.28 2007/03/04 06:01:23 christos Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_ipccall.c,v 1.27 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ipccall.c,v 1.28 2007/03/04 06:01:23 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_sysv.h" @@ -96,7 +96,7 @@ linux_sys_ipc(l, v, retval) syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; } */ *uap = v; switch (SCARG(uap, what)) { @@ -178,7 +178,7 @@ linux_semop(l, uap, retval) syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; } */ *uap; register_t *retval; { @@ -199,7 +199,7 @@ linux_semget(l, uap, retval) syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; } */ *uap; register_t *retval; { @@ -224,7 +224,7 @@ linux_msgsnd(l, uap, retval) syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; } */ *uap; register_t *retval; { @@ -246,7 +246,7 @@ linux_msgrcv(l, uap, retval) syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; } */ *uap; register_t *retval; { @@ -274,7 +274,7 @@ linux_msgget(l, uap, retval) syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; } */ *uap; register_t *retval; { @@ -301,7 +301,7 @@ linux_shmdt(l, uap, retval) syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; } */ *uap; register_t *retval; { @@ -323,7 +323,7 @@ linux_shmget(l, uap, retval) syscallarg(int) a1; syscallarg(int) a2; syscallarg(int) a3; - syscallarg(caddr_t) ptr; + syscallarg(void *) ptr; } */ *uap; register_t *retval; { diff --git a/sys/compat/linux/common/linux_llseek.c b/sys/compat/linux/common/linux_llseek.c index d27850df0be..475c9376c20 100644 --- a/sys/compat/linux/common/linux_llseek.c +++ b/sys/compat/linux/common/linux_llseek.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_llseek.c,v 1.28 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_llseek.c,v 1.29 2007/03/04 06:01:23 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_llseek.c,v 1.28 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_llseek.c,v 1.29 2007/03/04 06:01:23 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -71,7 +71,7 @@ linux_sys_llseek(l, v, retval) syscallarg(int) fd; syscallarg(uint32_t) ohigh; syscallarg(uint32_t) olow; - syscallarg(caddr_t) res; + syscallarg(void *) res; syscallarg(int) whence; } */ *uap = v; struct sys_lseek_args bla; 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 diff --git a/sys/compat/linux/common/linux_misc_notalpha.c b/sys/compat/linux/common/linux_misc_notalpha.c index 330a81a9d10..1f4fb45d458 100644 --- a/sys/compat/linux/common/linux_misc_notalpha.c +++ b/sys/compat/linux/common/linux_misc_notalpha.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_misc_notalpha.c,v 1.85 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_misc_notalpha.c,v 1.86 2007/03/04 06:01:24 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.85 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.86 2007/03/04 06:01:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -270,7 +270,7 @@ linux_sys_utime(l, v, retval) syscallarg(struct linux_utimbuf *)times; } */ *uap = v; struct proc *p = l->l_proc; - caddr_t sg; + void *sg; int error; struct sys_utimes_args ua; struct timeval tv[2], *tvp; @@ -470,7 +470,7 @@ linux_sys_statfs64(l, v, retval) struct statvfs *btmp, *bsp; struct linux_statfs64 ltmp; struct sys_statvfs1_args bsa; - caddr_t sg; + void *sg; int error; if (SCARG(uap, sz) != sizeof ltmp) @@ -515,7 +515,7 @@ linux_sys_fstatfs64(l, v, retval) struct statvfs *btmp, *bsp; struct linux_statfs64 ltmp; struct sys_fstatvfs1_args bsa; - caddr_t sg; + void *sg; int error; if (SCARG(uap, sz) != sizeof ltmp) diff --git a/sys/compat/linux/common/linux_mtio.c b/sys/compat/linux/common/linux_mtio.c index a11e9e0895f..ba87c067e13 100644 --- a/sys/compat/linux/common/linux_mtio.c +++ b/sys/compat/linux/common/linux_mtio.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_mtio.c,v 1.3 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_mtio.c,v 1.4 2007/03/04 06:01:24 christos Exp $ */ /* * Copyright (c) 2005 Soren S. Jorvang. All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_mtio.c,v 1.3 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_mtio.c,v 1.4 2007/03/04 06:01:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -104,7 +104,7 @@ linux_ioctl_mtio(struct lwp *l, struct linux_sys_ioctl_args *uap, mt.mt_op = mtop_map[i].op; mt.mt_count = lmtop.mt_count; - error = ioctlf(fp, MTIOCTOP, (caddr_t)&mt, l); + error = ioctlf(fp, MTIOCTOP, (void *)&mt, l); break; case LINUX_MTIOCGET: lmtget.mt_type = LINUX_MT_ISUNKNOWN; diff --git a/sys/compat/linux/common/linux_sg.c b/sys/compat/linux/common/linux_sg.c index 37042783990..bfe98d88199 100644 --- a/sys/compat/linux/common/linux_sg.c +++ b/sys/compat/linux/common/linux_sg.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sg.c,v 1.9 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_sg.c,v 1.10 2007/03/04 06:01:24 christos Exp $ */ /* * Copyright (c) 2004 Soren S. Jorvang. All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_sg.c,v 1.9 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_sg.c,v 1.10 2007/03/04 06:01:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -141,7 +141,7 @@ linux_ioctl_sg(struct lwp *l, struct linux_sys_ioctl_args *uap, req.datalen = lreq.dxfer_len; req.databuf = lreq.dxferp; - error = ioctlf(fp, SCIOCCOMMAND, (caddr_t)&req, l); + error = ioctlf(fp, SCIOCCOMMAND, (void *)&req, l); if (error) { DPRINTF(("SCIOCCOMMAND failed %d\n", error)); break; diff --git a/sys/compat/linux/common/linux_signal.c b/sys/compat/linux/common/linux_signal.c index d767cf103fb..f60987b53d0 100644 --- a/sys/compat/linux/common/linux_signal.c +++ b/sys/compat/linux/common/linux_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_signal.c,v 1.53 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_signal.c,v 1.54 2007/03/04 06:01:24 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.53 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.54 2007/03/04 06:01:24 christos Exp $"); #define COMPAT_LINUX 1 @@ -483,7 +483,7 @@ int linux_sys_sigsuspend(struct lwp *l, void *v, register_t *retval) { struct linux_sys_sigsuspend_args /* { - syscallarg(caddr_t) restart; + syscallarg(void *) restart; syscallarg(int) oldmask; syscallarg(int) mask; } */ *uap = v; diff --git a/sys/compat/linux/common/linux_socket.c b/sys/compat/linux/common/linux_socket.c index 9d9c04d4e8d..804a425369f 100644 --- a/sys/compat/linux/common/linux_socket.c +++ b/sys/compat/linux/common/linux_socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.c,v 1.70 2007/02/11 08:00:59 mlelstv Exp $ */ +/* $NetBSD: linux_socket.c,v 1.71 2007/03/04 06:01:24 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.70 2007/02/11 08:00:59 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.71 2007/03/04 06:01:24 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -121,7 +121,7 @@ int linux_to_bsd_ip_sockopt __P((int)); int linux_to_bsd_tcp_sockopt __P((int)); int linux_to_bsd_udp_sockopt __P((int)); int linux_getifhwaddr __P((struct lwp *, register_t *, u_int, void *)); -static int linux_sa_get __P((struct lwp *, int, caddr_t *, struct sockaddr **, +static int linux_sa_get __P((struct lwp *, int, void **, struct sockaddr **, const struct osockaddr *, socklen_t *)); static int linux_sa_put __P((struct osockaddr *osa)); static int linux_to_bsd_msg_flags __P((int)); @@ -394,7 +394,7 @@ linux_sys_sendto(l, v, retval) if (SCARG(uap, to)) { struct sockaddr *sa; int error; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); error = linux_sa_get(l, SCARG(uap, s), &sg, &sa, SCARG(uap, to), &tolen); @@ -424,11 +424,11 @@ linux_sys_sendmsg(l, v, retval) struct msghdr msg; int error; struct iovec aiov[UIO_SMALLIOV], *iov; - caddr_t sg = 0; + void *sg = 0; int bflags; u_int8_t *control=NULL; - error = copyin(SCARG(uap, msg), (caddr_t)&msg, sizeof(msg)); + error = copyin(SCARG(uap, msg), (void *)&msg, sizeof(msg)); if (error) return (error); if ((unsigned int)msg.msg_iovlen > UIO_SMALLIOV) { @@ -439,7 +439,7 @@ linux_sys_sendmsg(l, v, retval) } else iov = aiov; if ((unsigned int)msg.msg_iovlen > 0) { - error = copyin((caddr_t)msg.msg_iov, (caddr_t)iov, + error = copyin((void *)msg.msg_iov, (void *)iov, (size_t)(msg.msg_iovlen * sizeof(struct iovec))); if (error) goto done; @@ -692,7 +692,7 @@ linux_sys_recvmsg(l, v, retval) return (error); if (CMSG_FIRSTHDR(&msg)) { - caddr_t sg; + void *sg; /* Need to fit within stackgap */ if (msg.msg_controllen > STACKGAPLEN/2) { @@ -736,7 +736,7 @@ linux_sys_recvmsg(l, v, retval) goto done; /* Fixup sockaddr */ - error = copyin((caddr_t)SCARG(uap, msg), (caddr_t)&msg, + error = copyin((void *)SCARG(uap, msg), (void *)&msg, sizeof(msg)); if (error) goto done; @@ -1142,7 +1142,7 @@ linux_getifhwaddr(struct lwp *l, register_t *retval, u_int fd, goto out; } - error = copyin(data, (caddr_t)&lreq, sizeof(lreq)); + error = copyin(data, (void *)&lreq, sizeof(lreq)); if (error) goto out; lreq.if_name[IF_NAME_LEN-1] = '\0'; /* just in case */ @@ -1165,13 +1165,13 @@ linux_getifhwaddr(struct lwp *l, register_t *retval, u_int fd, if (sadl->sdl_family != AF_LINK || sadl->sdl_type != IFT_ETHER) continue; - memcpy((caddr_t)&lreq.hwaddr.sa_data, + memcpy((void *)&lreq.hwaddr.sa_data, LLADDR(sadl), MIN(sadl->sdl_alen, sizeof(lreq.hwaddr.sa_data))); lreq.hwaddr.sa_family = sadl->sdl_family; - error = copyout((caddr_t)&lreq, data, + error = copyout((void *)&lreq, data, sizeof(lreq)); goto out; } @@ -1209,13 +1209,13 @@ linux_getifhwaddr(struct lwp *l, register_t *retval, u_int fd, if (ifnum--) /* not the reqested iface */ continue; - memcpy((caddr_t)&lreq.hwaddr.sa_data, + memcpy((void *)&lreq.hwaddr.sa_data, LLADDR(sadl), MIN(sadl->sdl_alen, sizeof(lreq.hwaddr.sa_data))); lreq.hwaddr.sa_family = sadl->sdl_family; - error = copyout((caddr_t)&lreq, data, + error = copyout((void *)&lreq, data, sizeof(lreq)); found = 1; break; @@ -1238,7 +1238,7 @@ linux_ioctl_socket(l, uap, retval) struct linux_sys_ioctl_args /* { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; } */ *uap; register_t *retval; { @@ -1275,7 +1275,7 @@ linux_ioctl_socket(l, uap, retval) ioctlf = fp->f_ops->fo_ioctl; pt.com = SCARG(uap, com); pt.data = SCARG(uap, data); - error = ioctlf(fp, PTIOCLINUX, (caddr_t)&pt, l); + error = ioctlf(fp, PTIOCLINUX, (void *)&pt, l); /* * XXX hack: if the function returns EJUSTRETURN, * it has stuffed a sysctl return value in pt.data. @@ -1355,7 +1355,7 @@ linux_sys_connect(l, v, retval) int error; struct sockaddr *sa; struct sys_connect_args bca; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); socklen_t namlen; namlen = SCARG(uap, namelen); @@ -1418,7 +1418,7 @@ linux_sys_bind(l, v, retval) SCARG(&bsa, s) = SCARG(uap, s); if (SCARG(uap, name)) { struct sockaddr *sa; - caddr_t sg = stackgap_init(p, 0); + void *sg = stackgap_init(p, 0); error = linux_sa_get(l, SCARG(uap, s), &sg, &sa, SCARG(uap, name), &namlen); @@ -1441,7 +1441,7 @@ linux_sys_getsockname(l, v, retval) { struct linux_sys_getsockname_args /* { syscallarg(int) fdes; - syscallarg(caddr_t) asa; + syscallarg(void *) asa; syscallarg(int *) alen; } */ *uap = v; int error; @@ -1463,7 +1463,7 @@ linux_sys_getpeername(l, v, retval) { struct sys_getpeername_args /* { syscallarg(int) fdes; - syscallarg(caddr_t) asa; + syscallarg(void *) asa; syscallarg(int *) alen; } */ *uap = v; int error; @@ -1486,7 +1486,7 @@ static int linux_sa_get(l, s, sgp, sap, osa, osalen) struct lwp *l; int s; - caddr_t *sgp; + void **sgp; struct sockaddr **sap; const struct osockaddr *osa; socklen_t *osalen; @@ -1522,7 +1522,7 @@ linux_sa_get(l, s, sgp, sap, osa, osalen) kosa = (struct osockaddr *) malloc(alloclen, M_TEMP, M_WAITOK); - if ((error = copyin(osa, (caddr_t) kosa, *osalen))) { + if ((error = copyin(osa, (void *) kosa, *osalen))) { DPRINTF(("error copying osa %d\n", error)); goto out; } @@ -1633,7 +1633,7 @@ linux_sa_put(osa) */ len = sizeof(sa.sa_len) + sizeof(sa.sa_family); - error = copyin((caddr_t) osa, (caddr_t) &sa, len); + error = copyin((void *) osa, (void *) &sa, len); if (error) return (error); @@ -1685,7 +1685,7 @@ linux_sys_send(l, v, retval) { struct linux_sys_send_args /* { syscallarg(int) s; - syscallarg(caddr_t) buf; + syscallarg(void *) buf; syscallarg(int) len; syscallarg(int) flags; } */ *uap = v; diff --git a/sys/compat/linux/common/linux_socket.h b/sys/compat/linux/common/linux_socket.h index 6e78ea96611..b1f7b98823e 100644 --- a/sys/compat/linux/common/linux_socket.h +++ b/sys/compat/linux/common/linux_socket.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socket.h,v 1.13 2005/12/11 12:20:19 christos Exp $ */ +/* $NetBSD: linux_socket.h,v 1.14 2007/03/04 06:01:24 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -161,11 +161,11 @@ #define LINUX_CMSG_DATA(cmsg) \ ((u_char *)(void *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr))) #define LINUX_CMSG_NXTHDR(mhdr, cmsg) \ - (((__caddr_t)(cmsg) + LINUX_CMSG_ALIGN((cmsg)->cmsg_len) + \ + (((char *)(cmsg) + LINUX_CMSG_ALIGN((cmsg)->cmsg_len) + \ LINUX_CMSG_ALIGN(sizeof(struct cmsghdr)) > \ - (((__caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \ + (((char *)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \ (struct cmsghdr *)NULL : \ - (struct cmsghdr *)((__caddr_t)(cmsg) + \ + (struct cmsghdr *)((char *)(cmsg) + \ LINUX_CMSG_ALIGN((cmsg)->cmsg_len))) #define LINUX_CMSG_ALIGNDIFF \ (CMSG_ALIGN(sizeof(struct cmsghdr)) - LINUX_CMSG_ALIGN(sizeof(struct cmsghdr))) diff --git a/sys/compat/linux/common/linux_socketcall.c b/sys/compat/linux/common/linux_socketcall.c index 0a1a8990c0e..6b6f2e473de 100644 --- a/sys/compat/linux/common/linux_socketcall.c +++ b/sys/compat/linux/common/linux_socketcall.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socketcall.c,v 1.31 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_socketcall.c,v 1.32 2007/03/04 06:01:24 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.31 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.32 2007/03/04 06:01:24 christos Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -133,7 +133,7 @@ linux_sys_socketcall(l, v, retval) if (SCARG(uap, what) < 0 || SCARG(uap, what) > LINUX_MAX_SOCKETCALL) return ENOSYS; - if ((error = copyin((caddr_t) SCARG(uap, args), (caddr_t) &lda, + if ((error = copyin((void *) SCARG(uap, args), (void *) &lda, linux_socketcall[SCARG(uap, what)].argsize))) { DPRINTF(("copyin for %s failed %d\n", linux_socketcall[SCARG(uap, what)].name, error)); diff --git a/sys/compat/linux/common/linux_socketcall.h b/sys/compat/linux/common/linux_socketcall.h index f17a8865846..d172d399b04 100644 --- a/sys/compat/linux/common/linux_socketcall.h +++ b/sys/compat/linux/common/linux_socketcall.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_socketcall.h,v 1.11 2006/02/09 19:18:56 manu Exp $ */ +/* $NetBSD: linux_socketcall.h,v 1.12 2007/03/04 06:01:24 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -110,7 +110,7 @@ /* !!!: This should be at least as large as any other struct here. */ struct linux_socketcall_dummy_args { int dummy_ints[4]; /* Max 4 ints */ - void * dummy_ptrs[3]; /* Max 3 pointers */ + void *dummy_ptrs[3]; /* Max 3 pointers */ }; struct linux_sys_socket_args { diff --git a/sys/compat/linux/common/linux_termios.c b/sys/compat/linux/common/linux_termios.c index f39c37e4537..74d2de4e0e7 100644 --- a/sys/compat/linux/common/linux_termios.c +++ b/sys/compat/linux/common/linux_termios.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_termios.c,v 1.28 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_termios.c,v 1.29 2007/03/04 06:01:24 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_termios.c,v 1.28 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_termios.c,v 1.29 2007/03/04 06:01:24 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_ptm.h" @@ -74,7 +74,7 @@ linux_ioctl_termios(l, uap, retval) struct linux_sys_ioctl_args /* { syscallarg(int) fd; syscallarg(u_long) com; - syscallarg(caddr_t) data; + syscallarg(void *) data; } */ *uap; register_t *retval; { @@ -107,7 +107,7 @@ linux_ioctl_termios(l, uap, retval) switch (com & 0xffff) { case LINUX_TCGETS: - error = (*bsdioctl)(fp, TIOCGETA, (caddr_t)&tmpbts, l); + error = (*bsdioctl)(fp, TIOCGETA, (void *)&tmpbts, l); if (error) goto out; bsd_termios_to_linux_termios(&tmpbts, &tmplts); @@ -120,7 +120,7 @@ linux_ioctl_termios(l, uap, retval) * First fill in all fields, so that we keep the current * values for fields that Linux doesn't know about. */ - error = (*bsdioctl)(fp, TIOCGETA, (caddr_t)&tmpbts, l); + error = (*bsdioctl)(fp, TIOCGETA, (void *)&tmpbts, l); if (error) goto out; error = copyin(SCARG(uap, data), &tmplts, sizeof tmplts); @@ -138,10 +138,10 @@ linux_ioctl_termios(l, uap, retval) com = TIOCSETAF; break; } - error = (*bsdioctl)(fp, com, (caddr_t)&tmpbts, l); + error = (*bsdioctl)(fp, com, (void *)&tmpbts, l); goto out; case LINUX_TCGETA: - error = (*bsdioctl)(fp, TIOCGETA, (caddr_t)&tmpbts, l); + error = (*bsdioctl)(fp, TIOCGETA, (void *)&tmpbts, l); if (error) goto out; bsd_termios_to_linux_termio(&tmpbts, &tmplt); @@ -154,7 +154,7 @@ linux_ioctl_termios(l, uap, retval) * First fill in all fields, so that we keep the current * values for fields that Linux doesn't know about. */ - error = (*bsdioctl)(fp, TIOCGETA, (caddr_t)&tmpbts, l); + error = (*bsdioctl)(fp, TIOCGETA, (void *)&tmpbts, l); if (error) goto out; error = copyin(SCARG(uap, data), &tmplt, sizeof tmplt); @@ -172,7 +172,7 @@ linux_ioctl_termios(l, uap, retval) com = TIOCSETAF; break; } - error = (*bsdioctl)(fp, com, (caddr_t)&tmpbts, l); + error = (*bsdioctl)(fp, com, (void *)&tmpbts, l); goto out; case LINUX_TCFLSH: switch((u_long)SCARG(uap, data)) { @@ -189,10 +189,10 @@ linux_ioctl_termios(l, uap, retval) error = EINVAL; goto out; } - error = (*bsdioctl)(fp, TIOCFLUSH, (caddr_t)&idat, l); + error = (*bsdioctl)(fp, TIOCFLUSH, (void *)&idat, l); goto out; case LINUX_TIOCGETD: - error = (*bsdioctl)(fp, TIOCGETD, (caddr_t)&idat, l); + error = (*bsdioctl)(fp, TIOCGETD, (void *)&idat, l); if (error) goto out; switch (idat) { @@ -246,7 +246,7 @@ linux_ioctl_termios(l, uap, retval) error = EINVAL; goto out; } - error = (*bsdioctl)(fp, TIOCSETD, (caddr_t)&idat, l); + error = (*bsdioctl)(fp, TIOCSETD, (void *)&idat, l); goto out; case LINUX_TIOCLINUX: error = copyin(SCARG(uap, data), &tioclinux, sizeof tioclinux); @@ -325,7 +325,7 @@ linux_ioctl_termios(l, uap, retval) case LINUX_TIOCGPTN: #ifndef NO_DEV_PTM { - caddr_t sg = stackgap_init(l->l_proc, 0); + void *sg = stackgap_init(l->l_proc, 0); struct ptmget ptm, *ptmp = stackgap_alloc(l->l_proc, &sg, sizeof(*ptmp)); diff --git a/sys/compat/linux/common/linux_time.c b/sys/compat/linux/common/linux_time.c index 7a88e12341a..9c585d0d317 100644 --- a/sys/compat/linux/common/linux_time.c +++ b/sys/compat/linux/common/linux_time.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_time.c,v 1.15 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_time.c,v 1.16 2007/03/04 06:01:24 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.15 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.16 2007/03/04 06:01:24 christos Exp $"); #include <sys/param.h> #include <sys/ucred.h> @@ -183,7 +183,7 @@ linux_sys_clock_gettime(l, v, retval) syscallarg(clockid_t) which; syscallarg(struct linux_timespec *)tp; } */ *uap = v; - caddr_t sg; + void *sg; struct proc *p = l->l_proc; struct timespec *tp, ts; struct linux_timespec lts; @@ -223,7 +223,7 @@ linux_sys_clock_settime(l, v, retval) syscallarg(clockid_t) which; syscallarg(struct linux_timespec *)tp; } */ *uap = v; - caddr_t sg; + void *sg; struct proc *p = l->l_proc; struct timespec *tp, ts; struct linux_timespec lts; @@ -263,7 +263,7 @@ linux_sys_clock_getres(l, v, retval) syscallarg(clockid_t) which; syscallarg(struct linux_timespec *)tp; } */ *uap = v; - caddr_t sg; + void *sg; struct proc *p = l->l_proc; struct timespec *tp, ts; struct linux_timespec lts; @@ -312,7 +312,7 @@ linux_sys_clock_nanosleep(l, v, retval) syscallarg(struct linux_timespec) *rqtp; syscallarg(struct linux_timespec) *rmtp; } */ *uap = v; - caddr_t sg; + void *sg; struct proc *p = l->l_proc; struct timespec *rqtp, *rmtp; struct linux_timespec lrqts, lrmts; diff --git a/sys/compat/linux/common/linux_uselib.c b/sys/compat/linux/common/linux_uselib.c index 837bf923001..6b5049f8732 100644 --- a/sys/compat/linux/common/linux_uselib.c +++ b/sys/compat/linux/common/linux_uselib.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_uselib.c,v 1.19 2007/02/09 21:55:19 ad Exp $ */ +/* $NetBSD: linux_uselib.c,v 1.20 2007/03/04 06:01:24 christos Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.19 2007/02/09 21:55:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.20 2007/03/04 06:01:24 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,7 +93,7 @@ linux_sys_uselib(struct lwp *l, void *v, register_t *retval) struct linux_sys_uselib_args /* { syscallarg(const char *) path; } */ *uap = v; - caddr_t sg; + void *sg; long bsize, dsize, tsize, taddr, baddr, daddr; struct nameidata ni; struct vnode *vp; @@ -112,7 +112,7 @@ linux_sys_uselib(struct lwp *l, void *v, register_t *retval) vp = ni.ni_vp; - if ((error = vn_rdwr(UIO_READ, vp, (caddr_t) &hdr, LINUX_AOUT_HDR_SIZE, + if ((error = vn_rdwr(UIO_READ, vp, (void *) &hdr, LINUX_AOUT_HDR_SIZE, 0, UIO_SYSSPACE, IO_NODELOCKED, l->l_cred, &rem, NULL))) { vrele(vp); |
