diff --git a/sys/kern/exec_elf32.c b/sys/kern/exec_elf32.c index 0d6992d8cdc7..20505715dc55 100644 --- a/sys/kern/exec_elf32.c +++ b/sys/kern/exec_elf32.c @@ -1,4 +1,4 @@ -/* $NetBSD: exec_elf32.c,v 1.135 2008/07/18 21:29:48 christos Exp $ */ +/* $NetBSD: exec_elf32.c,v 1.136 2008/09/15 18:12:56 rmind Exp $ */ /*- * Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ */ #include -__KERNEL_RCSID(1, "$NetBSD: exec_elf32.c,v 1.135 2008/07/18 21:29:48 christos Exp $"); +__KERNEL_RCSID(1, "$NetBSD: exec_elf32.c,v 1.136 2008/09/15 18:12:56 rmind Exp $"); /* If not included by exec_elf64.c, ELFSIZE won't be defined. */ #ifndef ELFSIZE @@ -255,7 +255,7 @@ elf_copyargs(struct lwp *l, struct exec_package *pack, if (execname) { char *path = pack->ep_path; - execname->a_v = (intptr_t)(*stackp + vlen); + execname->a_v = (uintptr_t)(*stackp + vlen); len = strlen(path) + 1; if ((error = copyout(path, (*stackp + vlen), len)) != 0) return error; diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index c868cda5c06e..5bf952f0c504 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_subr.c,v 1.190 2008/06/11 10:40:21 drochner Exp $ */ +/* $NetBSD: kern_subr.c,v 1.191 2008/09/15 18:12:56 rmind Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.190 2008/06/11 10:40:21 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.191 2008/09/15 18:12:56 rmind Exp $"); #include "opt_ddb.h" #include "opt_md.h" @@ -271,7 +271,7 @@ copyin_vmspace(struct vmspace *vm, const void *uaddr, void *kaddr, size_t len) iov.iov_len = len; uio.uio_iov = &iov; uio.uio_iovcnt = 1; - uio.uio_offset = (off_t)(intptr_t)uaddr; + uio.uio_offset = (off_t)(uintptr_t)uaddr; uio.uio_resid = len; uio.uio_rw = UIO_READ; UIO_SETUP_SYSSPACE(&uio); @@ -304,7 +304,7 @@ copyout_vmspace(struct vmspace *vm, const void *kaddr, void *uaddr, size_t len) iov.iov_len = len; uio.uio_iov = &iov; uio.uio_iovcnt = 1; - uio.uio_offset = (off_t)(intptr_t)uaddr; + uio.uio_offset = (off_t)(uintptr_t)uaddr; uio.uio_resid = len; uio.uio_rw = UIO_WRITE; UIO_SETUP_SYSSPACE(&uio); diff --git a/sys/kern/sys_descrip.c b/sys/kern/sys_descrip.c index d765c0baa1b6..aacf972cbd83 100644 --- a/sys/kern/sys_descrip.c +++ b/sys/kern/sys_descrip.c @@ -1,4 +1,4 @@ -/* $NetBSD: sys_descrip.c,v 1.6 2008/08/31 20:55:55 njoly Exp $ */ +/* $NetBSD: sys_descrip.c,v 1.7 2008/09/15 18:12:56 rmind Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.6 2008/08/31 20:55:55 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.7 2008/09/15 18:12:56 rmind Exp $"); #include #include @@ -428,7 +428,7 @@ sys_fcntl(struct lwp *l, const struct sys_fcntl_args *uap, register_t *retval) break; case F_SETOWN: - tmp = (int)(intptr_t) SCARG(uap, arg); + tmp = (int)(uintptr_t) SCARG(uap, arg); error = (*fp->f_ops->fo_ioctl)(fp, FIOSETOWN, &tmp); break;