diff options
| author | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2005-12-11 12:16:03 +0000 |
| commit | 95e1ffb15694e54f29f8baaa4232152b703c2a5a (patch) | |
| tree | d6510e195bc06092a8057e34c6442eba4e77d09a /sys/compat/linux/common/linux_misc.c | |
| parent | 4f17ba81bcaf3f5086d88a346cbfd12506a5e3e6 (diff) | |
merge ktrace-lwp.
Diffstat (limited to 'sys/compat/linux/common/linux_misc.c')
| -rw-r--r-- | sys/compat/linux/common/linux_misc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/compat/linux/common/linux_misc.c b/sys/compat/linux/common/linux_misc.c index 9b9252ab409..9268285f326 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.146 2005/11/30 11:36:22 rpaulo Exp $ */ +/* $NetBSD: linux_misc.c,v 1.147 2005/12/11 12:20:19 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.146 2005/11/30 11:36:22 rpaulo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.147 2005/12/11 12:20:19 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -379,7 +379,7 @@ linux_sys_statfs(l, v, retval) sg = stackgap_init(p, 0); bsp = (struct statvfs *) stackgap_alloc(p, &sg, sizeof (struct statvfs)); - CHECK_ALT_EXIST(p, &sg, SCARG(uap, path)); + CHECK_ALT_EXIST(l, &sg, SCARG(uap, path)); SCARG(&bsa, path) = SCARG(uap, path); SCARG(&bsa, buf) = bsp; @@ -838,7 +838,7 @@ linux_sys_getdents(l, v, retval) goto out1; } - if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p))) + if ((error = VOP_GETATTR(vp, &va, p->p_ucred, l))) goto out1; nbytes = SCARG(uap, count); @@ -863,7 +863,7 @@ again: auio.uio_iovcnt = 1; auio.uio_rw = UIO_READ; auio.uio_segflg = UIO_SYSSPACE; - auio.uio_procp = NULL; + auio.uio_lwp = NULL; auio.uio_resid = buflen; auio.uio_offset = off; /* @@ -953,7 +953,7 @@ out: free(cookiebuf, M_TEMP); free(tbuf, M_TEMP); out1: - FILE_UNUSE(fp, p); + FILE_UNUSE(fp, l); return error; } |
