From 338d20055d0ef8817b63172a636095dc2bc75fe0 Mon Sep 17 00:00:00 2001 From: bde Date: Sat, 2 Dec 1995 17:11:20 +0000 Subject: Finished (?) cleaning up sysinit stuff. --- sys/kern/init_main.c | 47 +++++++++++++++++++++++------------------------ sys/kern/kern_clock.c | 13 ++++--------- sys/kern/kern_malloc.c | 11 +++-------- sys/kern/kern_synch.c | 13 +++---------- sys/kern/kern_tc.c | 13 ++++--------- sys/kern/kern_timeout.c | 13 ++++--------- sys/kern/subr_prof.c | 6 +++--- sys/kern/uipc_domain.c | 11 +++++------ sys/kern/uipc_mbuf.c | 11 +++-------- sys/kern/vfs_bio.c | 12 +++--------- sys/kern/vfs_conf.c | 9 ++------- sys/kern/vfs_init.c | 12 +++++------- sys/kern/vfs_mount.c | 9 ++------- sys/net/if_disc.c | 8 ++++---- sys/net/if_loop.c | 6 +++--- sys/vm/vm_glue.c | 8 ++++---- sys/vm/vm_init.c | 6 +++--- 17 files changed, 78 insertions(+), 130 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 59eecdb..62ed08f 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.31 1995/10/08 00:05:59 swallace Exp $ + * $Id: init_main.c,v 1.32 1995/11/28 07:29:59 bde Exp $ */ #include @@ -223,9 +223,9 @@ main(framep) /* ARGSUSED*/ void kproc_start(udata) - void *udata; /* pointer to a 'kproc_desc' ? */ + void *udata; { - struct kproc_desc *kp = (struct kproc_desc *)udata; + struct kproc_desc *kp = udata; struct proc *p = curproc; /* save a global descriptor, if desired*/ @@ -242,7 +242,7 @@ kproc_start(udata) (*kp->func)(); /* NOTREACHED */ - panic( "kproc_start: %s", kp->arg0); + panic("kproc_start: %s", kp->arg0); } @@ -279,8 +279,7 @@ print_caddr_t(data) { printf("%s", (char *)data); } -SYSINIT(announce, SI_SUB_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t, - copyright) +SYSINIT(announce, SI_SUB_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t, copyright) /* @@ -297,10 +296,10 @@ SYSINIT(announce, SI_SUB_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t, *************************************************************************** */ /* ARGSUSED*/ -void proc0_init __P((void *udata)); +void proc0_init __P((void *dummy)); void -proc0_init(udata) - void *udata; /* not used*/ +proc0_init(dummy) + void *dummy; { register struct proc *p; register struct filedesc0 *fdp; @@ -400,10 +399,10 @@ proc0_init(udata) SYSINIT(p0init, SI_SUB_INTRINSIC, SI_ORDER_FIRST, proc0_init, NULL) /* ARGSUSED*/ -void proc0_post __P((void *udata)); +void proc0_post __P((void *dummy)); void -proc0_post(udata) - void *udata; /* not used*/ +proc0_post(dummy) + void *dummy; { /* * Now can look at time, having had a chance to verify the time @@ -430,10 +429,10 @@ SYSINIT(p0post, SI_SUB_INTRINSIC_POST, SI_ORDER_FIRST, proc0_post, NULL) *************************************************************************** */ /* ARGSUSED*/ -void sched_setup __P((void *udata)); +void sched_setup __P((void *dummy)); void -sched_setup(udata) - void *udata; /* not used*/ +sched_setup(dummy) + void *dummy; { /* Kick off timeout driven events by calling first time. */ roundrobin(NULL); @@ -442,10 +441,10 @@ sched_setup(udata) SYSINIT(sched_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, sched_setup, NULL) /* ARGSUSED*/ -void xxx_vfs_mountroot __P((void *udata)); +void xxx_vfs_mountroot __P((void *dummy)); void -xxx_vfs_mountroot(udata) - void *udata; /* not used*/ +xxx_vfs_mountroot(dummy) + void *dummy; { /* Mount the root file system. */ if ((*mountroot)(mountrootvfsops)) @@ -454,10 +453,10 @@ xxx_vfs_mountroot(udata) SYSINIT(mountroot, SI_SUB_ROOT, SI_ORDER_FIRST, xxx_vfs_mountroot, NULL) /* ARGSUSED*/ -void xxx_vfs_root_fdtab __P((void *udata)); +void xxx_vfs_root_fdtab __P((void *dummy)); void -xxx_vfs_root_fdtab(udata) - void *udata; /* not used*/ +xxx_vfs_root_fdtab(dummy) + void *dummy; { register struct filedesc0 *fdp = &filedesc0; @@ -485,7 +484,7 @@ SYSINIT(retrofit, SI_SUB_ROOT_FDTAB, SI_ORDER_FIRST, xxx_vfs_root_fdtab, NULL) *************************************************************************** */ -static void kthread_init __P((void *udata)); +static void kthread_init __P((void *dummy)); SYSINIT_KT(init,SI_SUB_KTHREAD_INIT, SI_ORDER_FIRST, kthread_init, NULL) @@ -493,8 +492,8 @@ static void start_init __P((struct proc *p, void *framep)); /* ARGSUSED*/ static void -kthread_init(udata) - void *udata; /* not used*/ +kthread_init(dummy) + void *dummy; { /* Create process 1 (init(8)). */ diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 581ba5a..e604eee 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.18 1995/11/08 08:45:58 phk Exp $ + * $Id: kern_clock.c,v 1.19 1995/11/12 19:51:48 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -75,14 +75,9 @@ #include #endif -/* - * System initialization - */ - -static void initclocks __P((void *udata)); +static void initclocks __P((void *dummy)); SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL) - /* Does anybody else really care about these? */ struct callout *callfree, *callout, calltodo; @@ -393,8 +388,8 @@ hardupdate(offset) */ /* ARGSUSED*/ static void -initclocks(udata) - void *udata; /* not used*/ +initclocks(dummy) + void *dummy; { register int i; diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index dba7930..f317006 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $Id: kern_malloc.c,v 1.13 1995/08/28 09:18:44 julian Exp $ + * $Id: kern_malloc.c,v 1.14 1995/09/09 18:10:03 davidg Exp $ */ #include @@ -43,14 +43,9 @@ #include #include -/* - * System initialization - */ - static void kmeminit __P((void *)); SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL) - struct kmembuckets bucket[MINBUCKET + 16]; struct kmemstats kmemstats[M_LAST]; struct kmemusage *kmemusage; @@ -366,8 +361,8 @@ free(addr, type) */ /* ARGSUSED*/ static void -kmeminit(udata) - void *udata; /* not used*/ +kmeminit(dummy) + void *dummy; { register long indx; int npg; diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 1d0603e..a6dbfa9 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.6 (Berkeley) 1/21/94 - * $Id: kern_synch.c,v 1.12 1995/08/28 09:18:45 julian Exp $ + * $Id: kern_synch.c,v 1.13 1995/09/09 18:10:04 davidg Exp $ */ #include @@ -54,16 +54,9 @@ #include - -/* - * System initialization - */ - static void rqinit __P((void *)); SYSINIT(runqueue, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, rqinit, NULL) - - u_char curpriority; /* usrpri of curproc */ int lbolt; /* once a second sleep address */ @@ -614,8 +607,8 @@ mi_switch() */ /* ARGSUSED*/ static void -rqinit(udata) - void *udata; /* not used*/ +rqinit(dummy) + void *dummy; { register int i; diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 581ba5a..e604eee 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.18 1995/11/08 08:45:58 phk Exp $ + * $Id: kern_clock.c,v 1.19 1995/11/12 19:51:48 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -75,14 +75,9 @@ #include #endif -/* - * System initialization - */ - -static void initclocks __P((void *udata)); +static void initclocks __P((void *dummy)); SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL) - /* Does anybody else really care about these? */ struct callout *callfree, *callout, calltodo; @@ -393,8 +388,8 @@ hardupdate(offset) */ /* ARGSUSED*/ static void -initclocks(udata) - void *udata; /* not used*/ +initclocks(dummy) + void *dummy; { register int i; diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 581ba5a..e604eee 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.18 1995/11/08 08:45:58 phk Exp $ + * $Id: kern_clock.c,v 1.19 1995/11/12 19:51:48 phk Exp $ */ /* Portions of this software are covered by the following: */ @@ -75,14 +75,9 @@ #include #endif -/* - * System initialization - */ - -static void initclocks __P((void *udata)); +static void initclocks __P((void *dummy)); SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL) - /* Does anybody else really care about these? */ struct callout *callfree, *callout, calltodo; @@ -393,8 +388,8 @@ hardupdate(offset) */ /* ARGSUSED*/ static void -initclocks(udata) - void *udata; /* not used*/ +initclocks(dummy) + void *dummy; { register int i; diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index 4b395aa..54216df 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_prof.c 8.3 (Berkeley) 9/23/93 - * $Id: subr_prof.c,v 1.10 1995/11/12 06:43:04 bde Exp $ + * $Id: subr_prof.c,v 1.11 1995/11/20 12:42:06 phk Exp $ */ #include @@ -58,8 +58,8 @@ extern char btext[]; extern char etext[]; static void -kmstartup(udata) - void *udata; +kmstartup(dummy) + void *dummy; { char *cp; struct gmonparam *p = &_gmonparam; diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index e32eaeb..f6fac9a 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_domain.c 8.2 (Berkeley) 10/18/93 - * $Id: uipc_domain.c,v 1.9 1995/09/09 18:10:11 davidg Exp $ + * $Id: uipc_domain.c,v 1.10 1995/11/16 18:59:50 phk Exp $ */ #include @@ -64,7 +64,6 @@ SYSINIT(splimp, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST, kludge_splimp, &x_save_spl) SYSINIT(domain, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, domaininit, NULL) SYSINIT(splx, SI_SUB_PROTO_END, SI_ORDER_FIRST, kludge_splx, &x_save_spl) - static void pffasttimo __P((void *)); static void pfslowtimo __P((void *)); @@ -79,8 +78,8 @@ extern struct linker_set domain_set; /* ARGSUSED*/ static void -domaininit(udata) - void *udata; /* not used*/ +domaininit(dummy) + void *dummy; { register struct domain *dp, **dpp; register struct protosw *pr; @@ -130,7 +129,7 @@ static void kludge_splimp(udata) void *udata; { - int *savesplp = (int *)udata; + int *savesplp = udata; *savesplp = splimp(); } @@ -139,7 +138,7 @@ static void kludge_splx(udata) void *udata; { - int *savesplp = (int *)udata; + int *savesplp = udata; splx( *savesplp); } diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index d180cac..b7cef67 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: uipc_mbuf.c,v 1.12 1995/09/09 18:10:12 davidg Exp $ + * $Id: uipc_mbuf.c,v 1.13 1995/10/29 15:31:08 phk Exp $ */ #include @@ -48,14 +48,9 @@ #include #include -/* - * System initialization - */ - static void mbinit __P((void *)); SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbinit, NULL) - struct mbuf *mbutl; char *mclrefcnt; struct mbstat mbstat; @@ -67,8 +62,8 @@ int max_datalen; /* ARGSUSED*/ static void -mbinit(udata) - void *udata; /* not used*/ +mbinit(dummy) + void *dummy; { int s; diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 8a7219a..522d016 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.70 1995/11/18 23:33:48 dyson Exp $ + * $Id: vfs_bio.c,v 1.71 1995/11/19 19:54:22 dyson Exp $ */ /* @@ -52,13 +52,8 @@ #include -/* - * System initialization - */ - static void vfs_update __P((void)); struct proc *updateproc; - static struct kproc_desc up_kp = { "update", vfs_update, @@ -66,7 +61,6 @@ static struct kproc_desc up_kp = { }; SYSINIT_KT(update, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, &up_kp) - struct buf *buf; /* buffer header pool */ struct swqueue bswlist; @@ -1348,10 +1342,10 @@ count_lock_queue() int vfs_update_interval = 30; -void +static void vfs_update() { - (void) spl0(); + (void) spl0(); /* XXX redundant? wrong place? */ while (1) { tsleep(&vfs_update_wakeup, PRIBIO, "update", hz * vfs_update_interval); diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index ba2a229..22d08fc 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.9 1995/09/09 18:10:15 davidg Exp $ + * $Id: vfs_conf.c,v 1.10 1995/10/29 15:31:25 phk Exp $ */ /* @@ -98,7 +98,7 @@ struct vfsops *mountrootvfsops; */ int vfs_mountroot(data) - void *data; /* file system function table*/ + void *data; { struct mount *mp; u_int size; @@ -167,8 +167,3 @@ error_1: /* lock error*/ success: return( err); } - - -/* - * EOF -- This file has not been truncated. - */ diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index efbb5e4..af3fde2 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94 - * $Id: vfs_init.c,v 1.13 1995/11/09 08:13:51 bde Exp $ + * $Id: vfs_init.c,v 1.14 1995/11/20 12:42:09 phk Exp $ */ @@ -56,13 +56,11 @@ #include #include -/* - * System initialization - */ - static void vfsinit __P((void *)); SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vfsinit, NULL) +void vfs_op_init __P((void)); + /* * Sigh, such primitive tools are these... */ @@ -239,8 +237,8 @@ struct vattr va_null; */ /* ARGSUSED*/ static void -vfsinit(udata) - void *udata; /* not used*/ +vfsinit(dummy) + void *dummy; { struct vfsops **vfsp; struct vfsconf **vfc; diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index ba2a229..22d08fc 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.9 1995/09/09 18:10:15 davidg Exp $ + * $Id: vfs_conf.c,v 1.10 1995/10/29 15:31:25 phk Exp $ */ /* @@ -98,7 +98,7 @@ struct vfsops *mountrootvfsops; */ int vfs_mountroot(data) - void *data; /* file system function table*/ + void *data; { struct mount *mp; u_int size; @@ -167,8 +167,3 @@ error_1: /* lock error*/ success: return( err); } - - -/* - * EOF -- This file has not been truncated. - */ diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c index b3af66e..9a2ba0e 100644 --- a/sys/net/if_disc.c +++ b/sys/net/if_disc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)if_loop.c 8.1 (Berkeley) 6/10/93 - * $Id: if_disc.c,v 1.7 1995/09/22 17:57:47 wollman Exp $ + * $Id: if_disc.c,v 1.8 1995/10/29 15:31:59 phk Exp $ */ /* @@ -80,7 +80,7 @@ #define DSMTU 65532 #endif -static void discattach __P((void *udata)); +static void discattach __P((void *dummy)); PSEUDO_SET(discattach, if_disc); static struct ifnet dsif; @@ -90,8 +90,8 @@ static int dsioctl(struct ifnet *, int, caddr_t); /* ARGSUSED */ static void -discattach(udata) - void *udata; +discattach(dummy) + void *dummy; { register struct ifnet *ifp = &dsif; diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index cf29912..8cb5951 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 - * $Id: if_loop.c,v 1.13 1995/09/22 17:57:48 wollman Exp $ + * $Id: if_loop.c,v 1.14 1995/10/26 20:30:13 julian Exp $ */ /* @@ -93,8 +93,8 @@ struct ifnet loif[NLOOP]; /* ARGSUSED */ static void -loopattach(udata) - void *udata; +loopattach(dummy) + void *dummy; { register struct ifnet *ifp; register int i = 0; diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 85e1d00..ae340ef 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -59,7 +59,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_glue.c,v 1.29 1995/10/23 05:35:42 dyson Exp $ + * $Id: vm_glue.c,v 1.30 1995/11/05 20:45:59 dyson Exp $ */ #include @@ -291,7 +291,7 @@ static void vm_init_limits(udata) void *udata; { - register struct proc *p = (struct proc *)udata; + register struct proc *p = udata; int rss_limit; /* @@ -372,8 +372,8 @@ faultin(p) */ /* ARGSUSED*/ static void -scheduler(udata) - void *udata; /* not used*/ +scheduler(dummy) + void *dummy; { register struct proc *p; register int pri; diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index ffe5daa..8c15825 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_init.c,v 1.8 1995/08/28 09:19:23 julian Exp $ + * $Id: vm_init.c,v 1.9 1995/09/09 18:10:36 davidg Exp $ */ /* @@ -93,8 +93,8 @@ SYSINIT(vm_mem, SI_SUB_VM, SI_ORDER_FIRST, vm_mem_init, NULL) /* ARGSUSED*/ static void -vm_mem_init(udata) - void *udata; /* not used*/ +vm_mem_init(dummy) + void *dummy; { /* * Initializes resident memory structures. From here on, all physical -- cgit v1.1