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/dev/nullcons_subr.c | |
| parent | 4f17ba81bcaf3f5086d88a346cbfd12506a5e3e6 (diff) | |
merge ktrace-lwp.
Diffstat (limited to 'sys/dev/nullcons_subr.c')
| -rw-r--r-- | sys/dev/nullcons_subr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/nullcons_subr.c b/sys/dev/nullcons_subr.c index 2b0ad903720..2a9bbf2cfa5 100644 --- a/sys/dev/nullcons_subr.c +++ b/sys/dev/nullcons_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: nullcons_subr.c,v 1.3 2005/02/27 00:26:58 perry Exp $ */ +/* $NetBSD: nullcons_subr.c,v 1.4 2005/12/11 12:20:53 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nullcons_subr.c,v 1.3 2005/02/27 00:26:58 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nullcons_subr.c,v 1.4 2005/12/11 12:20:53 christos Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -85,20 +85,20 @@ nullcndev_read(dev, uio, flag) } int -nullcndev_ioctl(dev, cmd, data, flag, p) +nullcndev_ioctl(dev, cmd, data, flag, l) dev_t dev; u_long cmd; caddr_t data; int flag; - struct proc *p; + struct lwp *l; { int error; - error = (*nulltty->t_linesw->l_ioctl)(nulltty, cmd, data, flag, p); + error = (*nulltty->t_linesw->l_ioctl)(nulltty, cmd, data, flag, l); if (error != EPASSTHROUGH) return (error); - error = ttioctl(nulltty, cmd, data, flag, p); + error = ttioctl(nulltty, cmd, data, flag, l); if (error != EPASSTHROUGH) return (error); |
