From fe57fb71a2974b822711735406480c853c464151 Mon Sep 17 00:00:00 2001 From: simonb Date: Sun, 29 Jun 2003 09:23:14 +0000 Subject: [PATCH] Fix more needless 'struct proc *' to 'struct lwp *' fallout. --- sys/arch/mips/mips/cpu_exec.c | 6 +++--- sys/arch/mips/mips/mips_machdep.c | 8 ++++---- sys/arch/mips/mips/vm_machdep.c | 9 ++++----- sys/arch/mips/sibyte/dev/sbscn.c | 20 ++++++++++---------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/sys/arch/mips/mips/cpu_exec.c b/sys/arch/mips/mips/cpu_exec.c index 86147d9d5886..f5065a3f3cd5 100644 --- a/sys/arch/mips/mips/cpu_exec.c +++ b/sys/arch/mips/mips/cpu_exec.c @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_exec.c,v 1.37 2003/06/28 14:21:00 darrenr Exp $ */ +/* $NetBSD: cpu_exec.c,v 1.38 2003/06/29 09:24:54 simonb Exp $ */ /* * Copyright (c) 1992, 1993 @@ -212,7 +212,7 @@ mips_elf_makecmds (l, epp) if ((error = vn_rdwr(UIO_READ, epp->ep_vp, (caddr_t)&ph, sizeof ph, ex->e_phoff + i * sizeof ph, UIO_SYSSPACE, IO_NODELOCKED, - p->p_ucred, &resid, p)) + l->l_proc->p_ucred, &resid, l)) != 0) return error; @@ -287,7 +287,7 @@ mips_elf_makecmds (l, epp) epp->ep_maxsaddr = USRSTACK - MAXSSIZ; epp->ep_minsaddr = USRSTACK; - epp->ep_ssize = p->p_rlimit[RLIMIT_STACK].rlim_cur; + epp->ep_ssize = l->l_proc->p_rlimit[RLIMIT_STACK].rlim_cur; /* * set up commands for stack. note that this takes *two*, one to diff --git a/sys/arch/mips/mips/mips_machdep.c b/sys/arch/mips/mips/mips_machdep.c index 7fa6c47ccf8b..49aeda797428 100644 --- a/sys/arch/mips/mips/mips_machdep.c +++ b/sys/arch/mips/mips/mips_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: mips_machdep.c,v 1.163 2003/06/12 14:35:56 simonb Exp $ */ +/* $NetBSD: mips_machdep.c,v 1.164 2003/06/29 09:24:53 simonb Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -119,7 +119,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.163 2003/06/12 14:35:56 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.164 2003/06/29 09:24:53 simonb Exp $"); #include "opt_cputype.h" @@ -1116,14 +1116,14 @@ setregs(l, pack, stack) * Machine dependent system variables. */ int -cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) +cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, l) int *name; u_int namelen; void *oldp; size_t *oldlenp; void *newp; size_t newlen; - struct proc *p; + struct lwp *l; { #ifdef __HAVE_BOOTINFO_H struct btinfo_bootpath *bibp; diff --git a/sys/arch/mips/mips/vm_machdep.c b/sys/arch/mips/mips/vm_machdep.c index a12763fa5496..0182b67d8b5a 100644 --- a/sys/arch/mips/mips/vm_machdep.c +++ b/sys/arch/mips/mips/vm_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.95 2003/04/02 03:27:35 thorpej Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.96 2003/06/29 09:24:54 simonb Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -45,7 +45,7 @@ #include "opt_ddb.h" #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.95 2003/04/02 03:27:35 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.96 2003/06/29 09:24:54 simonb Exp $"); #include #include @@ -246,7 +246,6 @@ cpu_coredump(l, vp, cred, chdr) struct frame frame; struct fpreg fpregs; } cpustate; - struct proc *p = l->l_proc; CORE_SETMAGIC(*chdr, COREMAGIC, MID_MACHINE, 0); chdr->c_hdrsize = ALIGN(sizeof(struct core)); @@ -263,7 +262,7 @@ cpu_coredump(l, vp, cred, chdr) cseg.c_size = chdr->c_cpusize; error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize, (off_t)chdr->c_hdrsize, UIO_SYSSPACE, - IO_NODELOCKED|IO_UNIT, cred, NULL, p); + IO_NODELOCKED|IO_UNIT, cred, NULL, l); if (error) return error; @@ -271,7 +270,7 @@ cpu_coredump(l, vp, cred, chdr) (off_t)chdr->c_cpusize, (off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, - cred, NULL, p); + cred, NULL, l); if (!error) chdr->c_nseg++; diff --git a/sys/arch/mips/sibyte/dev/sbscn.c b/sys/arch/mips/sibyte/dev/sbscn.c index 44b64e6e4daf..1590f7fbf36c 100644 --- a/sys/arch/mips/sibyte/dev/sbscn.c +++ b/sys/arch/mips/sibyte/dev/sbscn.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbscn.c,v 1.8 2003/03/28 07:10:35 he Exp $ */ +/* $NetBSD: sbscn.c,v 1.9 2003/06/29 09:23:14 simonb Exp $ */ /* * Copyright 2000, 2001 @@ -540,7 +540,7 @@ sbscn_shutdown(struct sbscn_channel *ch) } int -sbscnopen(dev_t dev, int flag, int mode, struct proc *p) +sbscnopen(dev_t dev, int flag, int mode, struct lwp *l) { int unit = SBSCN_UNIT(dev); int chan = SBSCN_CHAN(dev); @@ -571,7 +571,7 @@ sbscnopen(dev_t dev, int flag, int mode, struct proc *p) if (ISSET(tp->t_state, TS_ISOPEN) && ISSET(tp->t_state, TS_XCLUDE) && - p->p_ucred->cr_uid != 0) + l->l_proc->p_ucred->cr_uid != 0) return (EBUSY); s = spltty(); @@ -677,7 +677,7 @@ bad: } int -sbscnclose(dev_t dev, int flag, int mode, struct proc *p) +sbscnclose(dev_t dev, int flag, int mode, struct lwp *l) { struct sbscn_softc *sc = sbscn_cd.cd_devs[SBSCN_UNIT(dev)]; struct sbscn_channel *ch = &sc->sc_channels[SBSCN_CHAN(dev)]; @@ -723,13 +723,13 @@ sbscnwrite(dev_t dev, struct uio *uio, int flag) } int -sbscnpoll(dev_t dev, int events, struct proc *p) +sbscnpoll(dev_t dev, int events, struct lwp *l) { struct sbscn_softc *sc = sbscn_cd.cd_devs[SBSCN_UNIT(dev)]; struct sbscn_channel *ch = &sc->sc_channels[SBSCN_CHAN(dev)]; struct tty *tp = ch->ch_tty; - return ((*tp->t_linesw->l_poll)(tp, events, p)); + return ((*tp->t_linesw->l_poll)(tp, events, l)); } struct tty * @@ -743,7 +743,7 @@ sbscntty(dev_t dev) } int -sbscnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) +sbscnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l) { struct sbscn_softc *sc = sbscn_cd.cd_devs[SBSCN_UNIT(dev)]; struct sbscn_channel *ch = &sc->sc_channels[SBSCN_CHAN(dev)]; @@ -751,11 +751,11 @@ sbscnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) int error; int s; - error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p); + error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l); if (error != EPASSTHROUGH) return (error); - error = ttioctl(tp, cmd, data, flag, p); + error = ttioctl(tp, cmd, data, flag, l); if (error != EPASSTHROUGH) return (error); @@ -785,7 +785,7 @@ sbscnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) break; case TIOCSFLAGS: - error = suser(p->p_ucred, &p->p_acflag); + error = suser(l->l_proc->p_ucred, &l->l_proc->p_acflag); if (error) break; ch->ch_swflags = *(int *)data;