diff options
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/init_main.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_clock.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_lock.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_module.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_resource.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_tc.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_threads.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_time.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_timeout.c | 4 | ||||
-rw-r--r-- | sys/kern/link_aout.c | 6 | ||||
-rw-r--r-- | sys/kern/subr_disklabel.c | 3 | ||||
-rw-r--r-- | sys/kern/sys_pipe.c | 3 | ||||
-rw-r--r-- | sys/kern/tty.c | 3 | ||||
-rw-r--r-- | sys/kern/uipc_usrreq.c | 3 | ||||
-rw-r--r-- | sys/kern/vfs_aio.c | 11 | ||||
-rw-r--r-- | sys/kern/vfs_bio.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_cache.c | 7 | ||||
-rw-r--r-- | sys/kern/vfs_cluster.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_conf.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_export.c | 5 | ||||
-rw-r--r-- | sys/kern/vfs_mount.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_subr.c | 5 | ||||
-rw-r--r-- | sys/kern/vfs_vnops.c | 4 |
23 files changed, 36 insertions, 64 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 3c2ae5b..9ca823c 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $Id: init_main.c,v 1.72 1997/09/21 22:00:03 gibbs Exp $ + * $Id: init_main.c,v 1.73 1997/11/06 19:29:07 phk Exp $ */ #include "opt_devfs.h" @@ -588,7 +588,7 @@ start_init(p) { vm_offset_t addr; struct execve_args args; - int options, i, retval[2], error; + int options, i, error; char **pathp, *path, *ucp, **uap, *arg0, *arg1; initproc = p; diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index f1b30b5..0cbe918 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.41 1997/09/21 22:00:07 gibbs Exp $ + * $Id: kern_clock.c,v 1.42 1997/09/24 16:39:16 gibbs Exp $ */ /* Portions of this software are covered by the following: */ @@ -454,7 +454,6 @@ void hardclock(frame) register struct clockframe *frame; { - register struct callout *p1; register struct proc *p; p = curproc; @@ -809,7 +808,6 @@ untimeout(ftn, arg, handle) void *arg; struct callout_handle handle; { - register struct callout *p, *t; register int s; /* diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index 4d0e4de..c14cc93 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * @(#)kern_lock.c 8.18 (Berkeley) 5/21/95 - * $Id: kern_lock.c,v 1.12 1997/09/21 04:22:52 dyson Exp $ + * $Id: kern_lock.c,v 1.13 1997/10/28 15:58:19 bde Exp $ */ #include <sys/param.h> @@ -124,7 +124,6 @@ apause(struct lock *lkp, int flags) { static int acquire(struct lock *lkp, int extflags, int wanted) { int error; - int lock_wait; if ((extflags & LK_NOWAIT) && (lkp->lk_flags & wanted)) { return EBUSY; @@ -379,7 +378,6 @@ lockmgr(lkp, flags, interlkp, p) static int acquiredrain(struct lock *lkp, int extflags) { int error; - int lock_wait; if ((extflags & LK_NOWAIT) && (lkp->lk_flags & LK_ALL)) { return EBUSY; diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index 80a8f14..b0fe29a 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_module.c,v 1.4 1997/10/28 15:58:21 bde Exp $ + * $Id: kern_module.c,v 1.5 1997/11/06 19:29:11 phk Exp $ */ #include <sys/param.h> @@ -70,7 +70,6 @@ static void module_shutdown(int arg1, void* arg2) { module_t mod; - int error; for (mod = TAILQ_FIRST(&modules); mod; mod = TAILQ_NEXT(mod, link)) MOD_EVENT(mod, MOD_SHUTDOWN); diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index d97b0c9..102de12 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_resource.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_resource.c,v 1.26 1997/08/26 00:20:11 bde Exp $ + * $Id: kern_resource.c,v 1.27 1997/11/06 19:29:13 phk Exp $ */ #include "opt_rlimit.h" @@ -75,7 +75,7 @@ getpriority(curp, uap) struct proc *curp; register struct getpriority_args *uap; { - register struct proc *p; + register struct proc *p = 0; register int low = PRIO_MAX + 1; switch (uap->which) { diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index f1b30b5..0cbe918 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.41 1997/09/21 22:00:07 gibbs Exp $ + * $Id: kern_clock.c,v 1.42 1997/09/24 16:39:16 gibbs Exp $ */ /* Portions of this software are covered by the following: */ @@ -454,7 +454,6 @@ void hardclock(frame) register struct clockframe *frame; { - register struct callout *p1; register struct proc *p; p = curproc; @@ -809,7 +808,6 @@ untimeout(ftn, arg, handle) void *arg; struct callout_handle handle; { - register struct callout *p, *t; register int s; /* diff --git a/sys/kern/kern_threads.c b/sys/kern/kern_threads.c index 37b1461..d618aad 100644 --- a/sys/kern/kern_threads.c +++ b/sys/kern/kern_threads.c @@ -46,7 +46,7 @@ * in Germany will I accept domestic beer. This code may or may not work * and I certainly make no claims as to its fitness for *any* purpose. * - * $Id: kern_threads.c,v 1.3 1997/09/02 20:05:44 bde Exp $ + * $Id: kern_threads.c,v 1.4 1997/11/06 19:29:16 phk Exp $ */ #include <sys/param.h> @@ -70,7 +70,7 @@ int thr_sleep(struct proc *p, struct thr_sleep_args *uap) { int sleepstart; struct timespec ts; - struct timeval atv, utv; + struct timeval atv; int error, s, timo; timo = 0; diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 57d498e..8060c15 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_time.c 8.1 (Berkeley) 6/10/93 - * $Id: kern_time.c,v 1.38 1997/10/26 20:26:28 phk Exp $ + * $Id: kern_time.c,v 1.39 1997/11/06 19:29:16 phk Exp $ */ #include <sys/param.h> @@ -333,7 +333,6 @@ signanosleep(p, uap) { struct timespec rmt, rqt; int error, error2; - struct sigacts *ps = p->p_sigacts; sigset_t mask; error = copyin(SCARG(uap, rqtp), &rqt, sizeof(rqt)); diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index f1b30b5..0cbe918 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.41 1997/09/21 22:00:07 gibbs Exp $ + * $Id: kern_clock.c,v 1.42 1997/09/24 16:39:16 gibbs Exp $ */ /* Portions of this software are covered by the following: */ @@ -454,7 +454,6 @@ void hardclock(frame) register struct clockframe *frame; { - register struct callout *p1; register struct proc *p; p = curproc; @@ -809,7 +808,6 @@ untimeout(ftn, arg, handle) void *arg; struct callout_handle handle; { - register struct callout *p, *t; register int s; /* diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c index 0d60384..4fbd5cd 100644 --- a/sys/kern/link_aout.c +++ b/sys/kern/link_aout.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: link_aout.c,v 1.2 1997/08/02 14:31:35 bde Exp $ + * $Id: link_aout.c,v 1.3 1997/10/24 05:29:07 jmg Exp $ */ #include <sys/param.h> @@ -101,12 +101,9 @@ static int link_aout_load_file(const char* filename, linker_file_t* result) { struct nameidata nd; - struct vnode* file; struct proc* p = curproc; /* XXX */ int error = 0; int resid; - struct iovec aiov; - struct uio auio; struct exec header; aout_file_t af; linker_file_t lf; @@ -370,7 +367,6 @@ link_aout_lookup_symbol(linker_file_t file, const char* name, caddr_t* address, size_t* size) { aout_file_t af = file->priv; - int buckets; long hashval; struct rrs_hash* hashbase; struct nzlist* symbolbase; diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index 0ca4f47..c87355c 100644 --- a/sys/kern/subr_disklabel.c +++ b/sys/kern/subr_disklabel.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94 - * $Id: ufs_disksubr.c,v 1.31 1997/07/13 15:53:20 bde Exp $ + * $Id: ufs_disksubr.c,v 1.32 1997/09/21 22:10:49 gibbs Exp $ */ #include <sys/param.h> @@ -69,7 +69,6 @@ bufqdisksort(bufq, bp) { struct buf *bq; struct buf *bn; - int count; /* * If the queue is empty or we are an diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 5821505..aaae9b3 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: sys_pipe.c,v 1.34 1997/10/06 08:30:08 peter Exp $ + * $Id: sys_pipe.c,v 1.35 1997/11/06 19:29:21 phk Exp $ */ /* @@ -238,7 +238,6 @@ static void pipeinit(cpipe) struct pipe *cpipe; { - int s; cpipe->pipe_buffer.in = 0; cpipe->pipe_buffer.out = 0; diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 2bf7f20..d1b708a 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $Id: tty.c,v 1.96 1997/09/14 02:40:44 peter Exp $ + * $Id: tty.c,v 1.97 1997/10/12 20:24:05 phk Exp $ */ /*- @@ -1486,7 +1486,6 @@ loop: int m = cc[VMIN]; long t = cc[VTIME]; struct timeval stime, timecopy; - int x; /* * Check each of the four combinations. diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index bbf41bf..dafb5d9 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 - * $Id: uipc_usrreq.c,v 1.27 1997/09/14 02:52:18 peter Exp $ + * $Id: uipc_usrreq.c,v 1.28 1997/10/12 20:24:18 phk Exp $ */ #include <sys/param.h> @@ -450,7 +450,6 @@ static int unp_attach(so) struct socket *so; { - register struct mbuf *m; register struct unpcb *unp; int error; diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 493de18..6625dab 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -13,7 +13,7 @@ * bad that happens because of using this software isn't the responsibility * of the author. This software is distributed AS-IS. * - * $Id: vfs_aio.c,v 1.8 1997/10/12 20:24:19 phk Exp $ + * $Id: vfs_aio.c,v 1.9 1997/11/06 19:29:27 phk Exp $ */ /* @@ -469,7 +469,6 @@ aio_startproc(void *uproc) while(1) { struct vmspace *myvm, *tmpvm; struct proc *cp = curproc; - struct proc *up = NULL; struct aiocblist *aiocbe; if ((aiop->aioprocflags & AIOP_FREE) == 0) { @@ -830,7 +829,6 @@ aio_return(struct proc *p, struct aio_return_args *uap) { int jobref, status; struct aiocblist *cb; struct kaioinfo *ki; - struct proc *userp; ki = p->p_aioinfo; if (ki == NULL) { @@ -906,7 +904,7 @@ aio_marksuspend(struct proc *p, int njobs, int *joblist, int set) { */ int aio_suspend(struct proc *p, struct aio_suspend_args *uap) { - struct timeval atv, utv; + struct timeval atv; struct timespec ts; struct aiocb *const *cbptr, *cbp; struct kaioinfo *ki; @@ -1036,11 +1034,10 @@ aio_cancel(struct proc *p, struct aio_cancel_args *uap) { */ int aio_error(struct proc *p, struct aio_error_args *uap) { - int activeflag, errorcode; struct aiocblist *cb; struct kaioinfo *ki; int jobref; - int error, status; + int status; ki = p->p_aioinfo; if (ki == NULL) @@ -1230,7 +1227,7 @@ aio_write(struct proc *p, struct aio_write_args *uap) { int lio_listio(struct proc *p, struct lio_listio_args *uap) { - int cnt, nent, nentqueued; + int nent, nentqueued; struct aiocb *iocb, * const *cbptr; struct aiocblist *cb; struct kaioinfo *ki; diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index b9d1335..72a2761 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: vfs_bio.c,v 1.132 1997/10/28 15:58:24 bde Exp $ + * $Id: vfs_bio.c,v 1.133 1997/11/06 19:29:29 phk Exp $ */ /* @@ -1278,7 +1278,6 @@ getblk(struct vnode * vp, daddr_t blkno, int size, int slpflag, int slptimeo) int s; struct bufhashhdr *bh; int maxsize; - static pid_t flushing = 0; if (vp->v_mount) { maxsize = vp->v_mount->mnt_stat.f_iosize; @@ -2091,7 +2090,6 @@ vfs_clean_pages(struct buf * bp) if (bp->b_flags & B_VMIO) { struct vnode *vp = bp->b_vp; - vm_object_t obj = vp->v_object; vm_ooffset_t foff; if (vp->v_type == VBLK) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 3d76d4f..ec72155 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)vfs_cache.c 8.5 (Berkeley) 3/22/95 - * $Id: vfs_cache.c,v 1.34 1997/10/15 13:22:52 phk Exp $ + * $Id: vfs_cache.c,v 1.35 1997/10/16 10:47:54 phk Exp $ */ #include <sys/param.h> @@ -156,8 +156,7 @@ cache_lookup(dvp, vpp, cnp) struct vnode **vpp; struct componentname *cnp; { - register struct namecache *ncp, *nnp; - register struct nchashhead *ncpp; + register struct namecache *ncp; if (!doingcache) { cnp->cn_flags &= ~MAKEENTRY; @@ -331,8 +330,6 @@ void cache_purge(vp) struct vnode *vp; { - struct namecache *ncp; - struct nchashhead *ncpp; static u_long nextid; while (!LIST_EMPTY(&vp->v_cache_src)) diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 304d4d3..1fff926 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 - * $Id: vfs_cluster.c,v 1.47 1997/06/15 17:56:49 dyson Exp $ + * $Id: vfs_cluster.c,v 1.48 1997/08/02 14:31:43 bde Exp $ */ #include <sys/param.h> @@ -85,7 +85,7 @@ cluster_read(vp, filesize, lblkno, size, cred, totread, seqcount, bpp) struct buf **bpp; { struct buf *bp, *rbp, *reqbp; - daddr_t blkno, rablkno, origblkno; + daddr_t blkno, origblkno; int error, num_ra; int i; int maxra, racluster; diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index 0e65cab..6aac763 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94 - * $Id: vfs_conf.c,v 1.15 1997/10/12 20:24:23 phk Exp $ + * $Id: vfs_conf.c,v 1.16 1997/10/16 07:32:14 julian Exp $ */ /* @@ -145,8 +145,6 @@ error_2: /* mount error*/ vfs_unbusy(mp, p); -error_1: /* lock error*/ - /* free mount struct before failing*/ free( mp, M_MOUNT); diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index ebc4dc3..412bb88 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.110 1997/10/12 20:24:26 phk Exp $ + * $Id: vfs_subr.c,v 1.111 1997/10/26 20:55:07 phk Exp $ */ /* @@ -650,7 +650,6 @@ void pbrelvp(bp) register struct buf *bp; { - struct vnode *vp; #if defined(DIAGNOSTIC) if (bp->b_vp == (struct vnode *) 0) @@ -1626,6 +1625,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS int kinfo_vdebug = 1; int kinfo_vgetfailed; +#if 0 #define KINFO_VNODESLOP 10 /* * Dump vnode list (via sysctl). @@ -1686,6 +1686,7 @@ again: return (0); } +#endif /* * XXX diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 0e65cab..6aac763 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94 - * $Id: vfs_conf.c,v 1.15 1997/10/12 20:24:23 phk Exp $ + * $Id: vfs_conf.c,v 1.16 1997/10/16 07:32:14 julian Exp $ */ /* @@ -145,8 +145,6 @@ error_2: /* mount error*/ vfs_unbusy(mp, p); -error_1: /* lock error*/ - /* free mount struct before failing*/ free( mp, M_MOUNT); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index ebc4dc3..412bb88 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.110 1997/10/12 20:24:26 phk Exp $ + * $Id: vfs_subr.c,v 1.111 1997/10/26 20:55:07 phk Exp $ */ /* @@ -650,7 +650,6 @@ void pbrelvp(bp) register struct buf *bp; { - struct vnode *vp; #if defined(DIAGNOSTIC) if (bp->b_vp == (struct vnode *) 0) @@ -1626,6 +1625,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS int kinfo_vdebug = 1; int kinfo_vgetfailed; +#if 0 #define KINFO_VNODESLOP 10 /* * Dump vnode list (via sysctl). @@ -1686,6 +1686,7 @@ again: return (0); } +#endif /* * XXX diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 19f35b0..c5be2e4 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $Id: vfs_vnops.c,v 1.39 1997/10/06 02:38:27 dyson Exp $ + * $Id: vfs_vnops.c,v 1.40 1997/10/27 15:26:23 bde Exp $ */ #include <sys/param.h> @@ -272,7 +272,7 @@ vn_read(fp, uio, cred) struct vnode *vp = (struct vnode *)fp->f_data; struct proc *p = uio->uio_procp; int count, error; - int flag, seq; + int flag; VOP_LEASE(vp, p, cred, LEASE_READ); vn_lock(vp, LK_SHARED | LK_NOPAUSE | LK_RETRY, p); |