From f3f3eadbf9de7a55ef1ff8cb23a68641403906ea Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 12 Mar 2015 17:41:56 +0100 Subject: [PATCH] kernel: Move semicolon from the definition of SYSINIT() to its invocations. This affected around 70 of our (more or less) 270 SYSINIT() calls. style(9) advocates the terminating semicolon to be supplied by the invocation too, because it can make life easier for editors and other source code parsing programs. --- sys/dev/misc/nmdm/nmdm.c | 3 ++- sys/dev/misc/syscons/sysmouse.c | 2 +- sys/kern/init_main.c | 20 ++++++++++---------- sys/kern/kern_clock.c | 4 ++-- sys/kern/kern_cputimer.c | 4 +--- sys/kern/kern_descrip.c | 4 ++-- sys/kern/kern_memio.c | 3 ++- sys/kern/kern_ntptime.c | 2 +- sys/kern/kern_sfbuf.c | 4 +--- sys/kern/kern_shutdown.c | 4 ++-- sys/kern/kern_slaballoc.c | 2 +- sys/kern/kern_synch.c | 2 +- sys/kern/subr_autoconf.c | 3 +-- sys/kern/subr_bus.c | 2 +- sys/kern/subr_cpu_topology.c | 2 +- sys/kern/subr_log.c | 3 ++- sys/kern/subr_prf.c | 2 +- sys/kern/sys_pipe.c | 2 +- sys/kern/sysv_msg.c | 2 +- sys/kern/sysv_sem.c | 2 +- sys/kern/tty_cons.c | 2 +- sys/kern/tty_pty.c | 3 ++- sys/kern/tty_subr.c | 2 +- sys/kern/tty_tty.c | 3 ++- sys/kern/uipc_domain.c | 3 +-- sys/kern/uipc_mbuf.c | 2 +- sys/kern/usched_bsd4.c | 4 ++-- sys/kern/usched_dfly.c | 2 +- sys/kern/usched_dummy.c | 4 ++-- sys/kern/vfs_bio.c | 4 ++-- sys/kern/vfs_init.c | 3 +-- sys/kern/vfs_mount.c | 2 +- sys/kern/vfs_synth.c | 2 +- sys/libprop/prop_array.c | 2 +- sys/libprop/prop_data.c | 2 +- sys/libprop/prop_dictionary.c | 8 ++++---- sys/libprop/prop_number.c | 2 +- sys/libprop/prop_string.c | 2 +- sys/net/bpf.c | 2 +- sys/net/if.c | 4 ++-- sys/platform/pc32/apic/ioapic.c | 2 +- sys/platform/pc32/apic/lapic.c | 2 +- sys/platform/pc32/i386/autoconf.c | 2 +- sys/platform/pc32/i386/machdep.c | 6 +++--- sys/platform/pc32/i386/mp_machdep.c | 4 ++-- sys/platform/pc64/apic/ioapic.c | 2 +- sys/platform/pc64/apic/lapic.c | 2 +- sys/platform/pc64/x86_64/autoconf.c | 2 +- sys/platform/pc64/x86_64/machdep.c | 6 +++--- sys/platform/pc64/x86_64/mp_machdep.c | 4 ++-- sys/platform/vkernel/i386/autoconf.c | 2 +- sys/platform/vkernel/i386/mp.c | 2 +- sys/platform/vkernel/platform/systimer.c | 2 +- sys/platform/vkernel64/platform/systimer.c | 2 +- sys/platform/vkernel64/x86_64/autoconf.c | 2 +- sys/platform/vkernel64/x86_64/mp.c | 2 +- sys/sys/kernel.h | 2 +- sys/sys/module.h | 3 +-- sys/sys/taskqueue.h | 2 +- sys/vfs/devfs/devfs_rules.c | 2 +- sys/vfs/ufs/ufs_dirhash.c | 2 +- sys/vm/swap_pager.c | 2 +- sys/vm/vm_glue.c | 2 +- sys/vm/vm_init.c | 3 +-- sys/vm/vm_mmap.c | 2 +- sys/vm/vm_page.c | 2 +- sys/vm/vm_pageout.c | 4 ++-- sys/vm/vm_pager.c | 2 +- sys/vm/vm_swapcache.c | 2 +- 69 files changed, 100 insertions(+), 104 deletions(-) diff --git a/sys/dev/misc/nmdm/nmdm.c b/sys/dev/misc/nmdm/nmdm.c index c190502db1..dd5f422930 100644 --- a/sys/dev/misc/nmdm/nmdm.c +++ b/sys/dev/misc/nmdm/nmdm.c @@ -608,4 +608,5 @@ nmdm_drvinit(void *unused) lwkt_reltoken(&tty_token); } -SYSINIT(nmdmdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,nmdm_drvinit,NULL) +SYSINIT(nmdmdev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, nmdm_drvinit, + NULL); diff --git a/sys/dev/misc/syscons/sysmouse.c b/sys/dev/misc/syscons/sysmouse.c index 7abd4e8850..999f6d3467 100644 --- a/sys/dev/misc/syscons/sysmouse.c +++ b/sys/dev/misc/syscons/sysmouse.c @@ -292,7 +292,7 @@ sm_attach_mouse(void *unused) } SYSINIT(sysmouse, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, - sm_attach_mouse, NULL) + sm_attach_mouse, NULL); int sysmouse_event(mouse_info_t *info) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index ca71e08db2..94fd0793c9 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -109,7 +109,7 @@ SYSCTL_ULONG(_kern, OID_AUTO, usched_global_cpumask, CTLFLAG_RW, * symbol is not undefined. A subsystem ID of SI_SPECIAL_DUMMY is never * executed. */ -SYSINIT(placeholder, SI_SPECIAL_DUMMY, SI_ORDER_ANY, NULL, NULL) +SYSINIT(placeholder, SI_SPECIAL_DUMMY, SI_ORDER_ANY, NULL, NULL); /* * The sysinit table itself. Items are checked off as the are run. @@ -295,7 +295,7 @@ print_caddr_t(void *data) { kprintf("%s", (char *)data); } -SYSINIT(announce, SI_BOOT1_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t, copyright) +SYSINIT(announce, SI_BOOT1_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t, copyright); /* * Leave the critical section that protected us from spurious interrupts @@ -313,7 +313,7 @@ leavecrit(void *dummy __unused) if (bootverbose) kprintf("Leaving critical section, allowing interrupts\n"); } -SYSINIT(leavecrit, SI_BOOT2_LEAVE_CRIT, SI_ORDER_ANY, leavecrit, NULL) +SYSINIT(leavecrit, SI_BOOT2_LEAVE_CRIT, SI_ORDER_ANY, leavecrit, NULL); /* * This is called after the threading system is up and running, @@ -324,7 +324,7 @@ tsleepworks(void *dummy __unused) { tsleep_now_works = 1; } -SYSINIT(tsleepworks, SI_BOOT2_FINISH_SMP, SI_ORDER_SECOND, tsleepworks, NULL) +SYSINIT(tsleepworks, SI_BOOT2_FINISH_SMP, SI_ORDER_SECOND, tsleepworks, NULL); /* * This is called after devices have configured. Tell the kernel we are @@ -335,7 +335,7 @@ endofcoldboot(void *dummy __unused) { cold = 0; } -SYSINIT(endofcoldboot, SI_SUB_ISWARM, SI_ORDER_ANY, endofcoldboot, NULL) +SYSINIT(endofcoldboot, SI_SUB_ISWARM, SI_ORDER_ANY, endofcoldboot, NULL); /* *************************************************************************** @@ -452,7 +452,7 @@ proc0_init(void *dummy __unused) (void)chgproccnt(p->p_ucred->cr_uidinfo, 1, 0); vm_init_limits(p); } -SYSINIT(p0init, SI_BOOT2_PROC0, SI_ORDER_FIRST, proc0_init, NULL) +SYSINIT(p0init, SI_BOOT2_PROC0, SI_ORDER_FIRST, proc0_init, NULL); static int proc0_post_callback(struct proc *p, void *data __unused); @@ -483,7 +483,7 @@ proc0_post_callback(struct proc *p, void *data __unused) return(0); } -SYSINIT(p0post, SI_SUB_PROC0_POST, SI_ORDER_FIRST, proc0_post, NULL) +SYSINIT(p0post, SI_SUB_PROC0_POST, SI_ORDER_FIRST, proc0_post, NULL); /* *************************************************************************** @@ -708,7 +708,7 @@ create_init(const void *udata __unused) cpu_set_fork_handler(lp, start_init, NULL); crit_exit(); } -SYSINIT(init, SI_SUB_CREATE_INIT, SI_ORDER_FIRST, create_init, NULL) +SYSINIT(init, SI_SUB_CREATE_INIT, SI_ORDER_FIRST, create_init, NULL); /* * Make it runnable now. @@ -718,7 +718,7 @@ kick_init(const void *udata __unused) { start_forked_proc(&lwp0, initproc); } -SYSINIT(kickinit, SI_SUB_KTHREAD_INIT, SI_ORDER_FIRST, kick_init, NULL) +SYSINIT(kickinit, SI_SUB_KTHREAD_INIT, SI_ORDER_FIRST, kick_init, NULL); static void kpmap_init(const void *udata __unused) @@ -740,7 +740,7 @@ kpmap_init(const void *udata __unused) kpmap->header[5].offset = offsetof(struct sys_kpmap, tick_freq); kpmap->version = KPMAP_VERSION; } -SYSINIT(kpmapinit, SI_BOOT1_POST, SI_ORDER_FIRST, kpmap_init, NULL) +SYSINIT(kpmapinit, SI_BOOT1_POST, SI_ORDER_FIRST, kpmap_init, NULL); /* * Machine independant globaldata initialization diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index fdf61cfd20..552877f01d 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -115,7 +115,7 @@ static void do_pctrack(struct intrframe *frame, int which); #endif static void initclocks (void *dummy); -SYSINIT(clocks, SI_BOOT2_CLOCKS, SI_ORDER_FIRST, initclocks, NULL) +SYSINIT(clocks, SI_BOOT2_CLOCKS, SI_ORDER_FIRST, initclocks, NULL); /* * Some of these don't belong here, but it's easiest to concentrate them. @@ -331,7 +331,7 @@ initclocks_other(void *dummy) } lwkt_setcpu_self(ogd); } -SYSINIT(clocks2, SI_BOOT2_POST_SMP, SI_ORDER_ANY, initclocks_other, NULL) +SYSINIT(clocks2, SI_BOOT2_POST_SMP, SI_ORDER_ANY, initclocks_other, NULL); /* * This sets the current real time of day. Timespecs are in seconds and diff --git a/sys/kern/kern_cputimer.c b/sys/kern/kern_cputimer.c index c531e68824..47a68db9f9 100644 --- a/sys/kern/kern_cputimer.c +++ b/sys/kern/kern_cputimer.c @@ -30,8 +30,6 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/kern/kern_cputimer.c,v 1.5 2008/06/05 18:06:32 swildner Exp $ */ /* * Generic cputimer - access to a reliable, free-running counter. @@ -448,7 +446,7 @@ cputimer_intr_initclocks(void) } /* NOTE: Must be SECOND to allow platform initialization to go first */ SYSINIT(cputimer_intr, SI_BOOT2_CLOCKREG, SI_ORDER_SECOND, - cputimer_intr_initclocks, NULL) + cputimer_intr_initclocks, NULL); static int sysctl_cputimer_intr_reglist(SYSCTL_HANDLER_ARGS) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index fb263a9e1d..9eebfe081f 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2945,5 +2945,5 @@ nofo_shutdown(struct file *fp, int how) return (EOPNOTSUPP); } -SYSINIT(fildescdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR, - fildesc_drvinit,NULL) +SYSINIT(fildescdev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, + fildesc_drvinit,NULL); diff --git a/sys/kern/kern_memio.c b/sys/kern/kern_memio.c index f3a3f74774..5ead6fdcbe 100644 --- a/sys/kern/kern_memio.c +++ b/sys/kern/kern_memio.c @@ -758,5 +758,6 @@ mem_drvinit(void *unused) make_dev(&mem_ops, 14, UID_ROOT, GID_WHEEL, 0600, "io"); } -SYSINIT(memdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,mem_drvinit,NULL) +SYSINIT(memdev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, mem_drvinit, + NULL); diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c index dbde8867fa..9a275560e0 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -579,7 +579,7 @@ ntp_init(void) #endif /* PPS_SYNC */ } -SYSINIT(ntpclocks, SI_BOOT2_CLOCKS, SI_ORDER_FIRST, ntp_init, NULL) +SYSINIT(ntpclocks, SI_BOOT2_CLOCKS, SI_ORDER_FIRST, ntp_init, NULL); /* * hardupdate() - local clock update diff --git a/sys/kern/kern_sfbuf.c b/sys/kern/kern_sfbuf.c index 513248e5b3..0111022ddb 100644 --- a/sys/kern/kern_sfbuf.c +++ b/sys/kern/kern_sfbuf.c @@ -21,8 +21,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/kern/kern_sfbuf.c,v 1.15 2007/04/30 07:18:53 dillon Exp $ */ #include @@ -43,7 +41,7 @@ #include static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_BOOT2_MACHDEP, SI_ORDER_ANY, sf_buf_init, NULL) +SYSINIT(sock_sf, SI_BOOT2_MACHDEP, SI_ORDER_ANY, sf_buf_init, NULL); LIST_HEAD(sf_buf_list, sf_buf); diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 49d3b0cda1..687e1792be 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -164,7 +164,7 @@ shutdown_conf(void *unused) EVENTHANDLER_REGISTER(shutdown_final, shutdown_reset, NULL, SHUTDOWN_PRI_LAST + 200); } -SYSINIT(shutdown_conf, SI_BOOT2_MACHDEP, SI_ORDER_ANY, shutdown_conf, NULL) +SYSINIT(shutdown_conf, SI_BOOT2_MACHDEP, SI_ORDER_ANY, shutdown_conf, NULL); /* ARGSUSED */ @@ -668,7 +668,7 @@ dump_conf(void *dummy) dumpdev = NULL; } -SYSINIT(dump_conf, SI_SUB_DUMP_CONF, SI_ORDER_FIRST, dump_conf, NULL) +SYSINIT(dump_conf, SI_SUB_DUMP_CONF, SI_ORDER_FIRST, dump_conf, NULL); static int sysctl_kern_dumpdev(SYSCTL_HANDLER_ARGS) diff --git a/sys/kern/kern_slaballoc.c b/sys/kern/kern_slaballoc.c index 77386dd7be..08232886db 100644 --- a/sys/kern/kern_slaballoc.c +++ b/sys/kern/kern_slaballoc.c @@ -209,7 +209,7 @@ static void kmeminit(void *dummy); char *ZeroPage; -SYSINIT(kmem, SI_BOOT1_ALLOCATOR, SI_ORDER_FIRST, kmeminit, NULL) +SYSINIT(kmem, SI_BOOT1_ALLOCATOR, SI_ORDER_FIRST, kmeminit, NULL); #ifdef INVARIANTS /* diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 6fd5434b88..5e873376ae 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -64,7 +64,7 @@ TAILQ_HEAD(tslpque, thread); static void sched_setup (void *dummy); -SYSINIT(sched_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, sched_setup, NULL) +SYSINIT(sched_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, sched_setup, NULL); int lbolt; void *lbolt_syncer; diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index 367eefba31..a71aff0696 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -38,7 +38,6 @@ * @(#)subr_autoconf.c 8.1 (Berkeley) 6/10/93 * * $FreeBSD: src/sys/kern/subr_autoconf.c,v 1.14 1999/10/05 21:19:41 n_hibma Exp $ - * $DragonFly: src/sys/kern/subr_autoconf.c,v 1.9 2007/07/28 23:24:33 dillon Exp $ */ #include @@ -122,7 +121,7 @@ run_interrupt_driven_config_hooks(void *dummy) } SYSINIT(intr_config_hooks, SI_SUB_INT_CONFIG_HOOKS, SI_ORDER_FIRST, - run_interrupt_driven_config_hooks, NULL) + run_interrupt_driven_config_hooks, NULL); /* * Register a hook that will be called after "cold" diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 79a3b62b73..ea588ca02e 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -2326,7 +2326,7 @@ resource_cfgload(void *dummy __unused) } } } -SYSINIT(cfgload, SI_BOOT1_POST, SI_ORDER_ANY + 50, resource_cfgload, 0) +SYSINIT(cfgload, SI_BOOT1_POST, SI_ORDER_ANY + 50, resource_cfgload, 0); /*======================================*/ diff --git a/sys/kern/subr_cpu_topology.c b/sys/kern/subr_cpu_topology.c index 26c2027c78..6f525210ff 100644 --- a/sys/kern/subr_cpu_topology.c +++ b/sys/kern/subr_cpu_topology.c @@ -690,4 +690,4 @@ init_cpu_topology(void) build_sysctl_cpu_topology(); } SYSINIT(cpu_topology, SI_BOOT2_CPU_TOPOLOGY, SI_ORDER_FIRST, - init_cpu_topology, NULL) + init_cpu_topology, NULL); diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index 95f4945070..6e174facb6 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -316,4 +316,5 @@ log_drvinit(void *unused) make_dev(&log_ops, 0, UID_ROOT, GID_WHEEL, 0600, "klog"); } -SYSINIT(logdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,log_drvinit,NULL) +SYSINIT(logdev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, log_drvinit, + NULL); diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index f8caff8ebc..d49d136cb4 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -983,7 +983,7 @@ static struct kproc_desc constty_kp = { &constty_td }; SYSINIT(bufdaemon, SI_SUB_KTHREAD_UPDATE, SI_ORDER_ANY, - kproc_start, &constty_kp) + kproc_start, &constty_kp); /* * Put character in log buffer with a particular priority. diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index c0c0a0f579..951314fcdf 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -167,7 +167,7 @@ pipeinit(void *dummy) pipe_maxcache *= 2; } } -SYSINIT(kmem, SI_BOOT2_MACHDEP, SI_ORDER_ANY, pipeinit, NULL) +SYSINIT(kmem, SI_BOOT2_MACHDEP, SI_ORDER_ANY, pipeinit, NULL); static void pipeclose (struct pipe *cpipe); static void pipe_free_kmem (struct pipe *cpipe); diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index e133716c1d..fff03a5e9b 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -172,7 +172,7 @@ msginit(void *dummy) msqids[i].msg_perm.mode = 0; } } -SYSINIT(sysv_msg, SI_SUB_SYSV_MSG, SI_ORDER_FIRST, msginit, NULL) +SYSINIT(sysv_msg, SI_SUB_SYSV_MSG, SI_ORDER_FIRST, msginit, NULL); static void msg_freehdr(struct msg *msghdr) diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index 31e84450f4..0c188bd7b4 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -180,7 +180,7 @@ seminit(void *dummy) semaptr->ds.sem_perm.mode = 0; } } -SYSINIT(sysv_sem, SI_SUB_SYSV_SEM, SI_ORDER_FIRST, seminit, NULL) +SYSINIT(sysv_sem, SI_SUB_SYSV_SEM, SI_ORDER_FIRST, seminit, NULL); /* * Allocate a new sem_undo structure for a process diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index fbbeccb9af..9d8c8936d9 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -563,4 +563,4 @@ cn_drvinit(void *unused) 0600, "console"); } -SYSINIT(cndev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cn_drvinit,NULL) +SYSINIT(cndev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, cn_drvinit, NULL); diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 5f8cc0a95f..f1e9f37b87 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -1283,4 +1283,5 @@ ptc_drvinit(void *unused) } } -SYSINIT(ptcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR_C,ptc_drvinit,NULL) +SYSINIT(ptcdev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR_C, ptc_drvinit, + NULL); diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index 3fce5b20a6..befd32d07c 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -60,7 +60,7 @@ #include static void clist_init (void *); -SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL) +SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL); static struct cblock *cfreelist = NULL; int cfreecount = 0; diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index a3d46774ad..de72f32d5f 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -331,4 +331,5 @@ ctty_drvinit(void *unused __unused) make_dev(&ctty_ops, 0, 0, 0, 0666, "tty"); } -SYSINIT(cttydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,ctty_drvinit,NULL) +SYSINIT(cttydev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE + CDEV_MAJOR, ctty_drvinit, + NULL); diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 63202f24e0..4393e0f269 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -28,7 +28,6 @@ * * @(#)uipc_domain.c 8.2 (Berkeley) 10/18/93 * $FreeBSD: src/sys/kern/uipc_domain.c,v 1.22.2.1 2001/07/03 11:01:37 ume Exp $ - * $DragonFly: src/sys/kern/uipc_domain.c,v 1.13 2008/10/27 02:56:30 sephe Exp $ */ #include @@ -59,7 +58,7 @@ */ static void domaininit (void *); -SYSINIT(domain, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, domaininit, NULL) +SYSINIT(domain, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, domaininit, NULL); static void pffasttimo (void *); static void pfslowtimo (void *); diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 81fa933432..272fd59d80 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -230,7 +230,7 @@ SYSCTL_PROC(_kern_ipc, OID_AUTO, showmbufs, CTLFLAG_RD|CTLTYPE_STRING, #endif static void mbinit(void *); -SYSINIT(mbuf, SI_BOOT2_MACHDEP, SI_ORDER_FIRST, mbinit, NULL) +SYSINIT(mbuf, SI_BOOT2_MACHDEP, SI_ORDER_FIRST, mbinit, NULL); struct mbtypes_stat { u_long stats[MT_NTYPES]; diff --git a/sys/kern/usched_bsd4.c b/sys/kern/usched_bsd4.c index b63574df8d..dde52ffc14 100644 --- a/sys/kern/usched_bsd4.c +++ b/sys/kern/usched_bsd4.c @@ -306,7 +306,7 @@ bsd4_rqinit(void *dummy) } ATOMIC_CPUMASK_NANDBIT(bsd4_curprocmask, 0); } -SYSINIT(runqueue, SI_BOOT2_USCHED, SI_ORDER_FIRST, bsd4_rqinit, NULL) +SYSINIT(runqueue, SI_BOOT2_USCHED, SI_ORDER_FIRST, bsd4_rqinit, NULL); /* * BSD4_ACQUIRE_CURPROC @@ -2047,4 +2047,4 @@ sched_thread_cpu_init(void) } } SYSINIT(uschedtd, SI_BOOT2_USCHED, SI_ORDER_SECOND, - sched_thread_cpu_init, NULL) + sched_thread_cpu_init, NULL); diff --git a/sys/kern/usched_dfly.c b/sys/kern/usched_dfly.c index ed99a8d3f2..eb42a24d2f 100644 --- a/sys/kern/usched_dfly.c +++ b/sys/kern/usched_dfly.c @@ -2340,4 +2340,4 @@ usched_dfly_cpu_init(void) } } SYSINIT(uschedtd, SI_BOOT2_USCHED, SI_ORDER_SECOND, - usched_dfly_cpu_init, NULL) + usched_dfly_cpu_init, NULL); diff --git a/sys/kern/usched_dummy.c b/sys/kern/usched_dummy.c index cb402244b5..0152df84d6 100644 --- a/sys/kern/usched_dummy.c +++ b/sys/kern/usched_dummy.c @@ -123,7 +123,7 @@ dummyinit(void *dummy) spin_init(&dummy_spin, "uscheddummy"); ATOMIC_CPUMASK_NANDBIT(dummy_curprocmask, 0); } -SYSINIT(runqueue, SI_BOOT2_USCHED, SI_ORDER_FIRST, dummyinit, NULL) +SYSINIT(runqueue, SI_BOOT2_USCHED, SI_ORDER_FIRST, dummyinit, NULL); /* * DUMMY_ACQUIRE_CURPROC @@ -554,4 +554,4 @@ dummy_sched_thread_cpu_init(void) kprintf("\n"); } SYSINIT(uschedtd, SI_BOOT2_USCHED, SI_ORDER_SECOND, - dummy_sched_thread_cpu_init, NULL) + dummy_sched_thread_cpu_init, NULL); diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 0f3d940f7a..cef46f9c28 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -2368,7 +2368,7 @@ static struct kproc_desc buf_kp = { &bufdaemon_td }; SYSINIT(bufdaemon, SI_SUB_KTHREAD_BUF, SI_ORDER_FIRST, - kproc_start, &buf_kp) + kproc_start, &buf_kp); static struct kproc_desc bufhw_kp = { "bufdaemon_hw", @@ -2376,7 +2376,7 @@ static struct kproc_desc bufhw_kp = { &bufdaemonhw_td }; SYSINIT(bufdaemon_hw, SI_SUB_KTHREAD_BUF, SI_ORDER_FIRST, - kproc_start, &bufhw_kp) + kproc_start, &bufhw_kp); static void buf_daemon1(struct thread *td, int queue, int (*buf_limit_fn)(long), diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 27870505a1..7fa28070cd 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -66,7 +66,6 @@ * * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94 * $FreeBSD: src/sys/kern/vfs_init.c,v 1.59 2002/04/30 18:44:32 dillon Exp $ - * $DragonFly: src/sys/kern/vfs_init.c,v 1.15 2008/06/01 19:27:35 dillon Exp $ */ /* * Manage vnode VOP operations vectors @@ -225,7 +224,7 @@ vfsinit(void *dummy) */ vattr_null(&va_null); } -SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vfsinit, NULL) +SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vfsinit, NULL); /* * vfsconf related functions/data. diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 63aae96ab7..f2092270bb 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -673,7 +673,7 @@ static struct kproc_desc vnlru_kp = { vnlru_proc, &vnlruthread }; -SYSINIT(vnlru, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, &vnlru_kp) +SYSINIT(vnlru, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, &vnlru_kp); /* * Move a vnode from one mount queue to another. diff --git a/sys/kern/vfs_synth.c b/sys/kern/vfs_synth.c index bdcb296a8a..158c51fddc 100644 --- a/sys/kern/vfs_synth.c +++ b/sys/kern/vfs_synth.c @@ -135,4 +135,4 @@ synthinit(void *arg __unused) synth_inited = 1; } -SYSINIT(synthinit, SI_SUB_VFS, SI_ORDER_ANY, synthinit, NULL) +SYSINIT(synthinit, SI_SUB_VFS, SI_ORDER_ANY, synthinit, NULL); diff --git a/sys/libprop/prop_array.c b/sys/libprop/prop_array.c index e44a3f6070..76477656ee 100644 --- a/sys/libprop/prop_array.c +++ b/sys/libprop/prop_array.c @@ -49,7 +49,7 @@ struct _prop_array { #define PA_F_IMMUTABLE 0x01 /* array is immutable */ -_PROP_POOL_INIT(_prop_array_pool, sizeof(struct _prop_array), "proparay") +_PROP_POOL_INIT(_prop_array_pool, sizeof(struct _prop_array), "proparay"); _PROP_MALLOC_DEFINE(M_PROP_ARRAY, "prop array", "property array container object") diff --git a/sys/libprop/prop_data.c b/sys/libprop/prop_data.c index 3fb8a0f384..472c76ffe2 100644 --- a/sys/libprop/prop_data.c +++ b/sys/libprop/prop_data.c @@ -58,7 +58,7 @@ struct _prop_data { #define PD_F_NOCOPY 0x01 -_PROP_POOL_INIT(_prop_data_pool, sizeof(struct _prop_data), "propdata") +_PROP_POOL_INIT(_prop_data_pool, sizeof(struct _prop_data), "propdata"); _PROP_MALLOC_DEFINE(M_PROP_DATA, "prop data", "property data container object") diff --git a/sys/libprop/prop_dictionary.c b/sys/libprop/prop_dictionary.c index abf3b757e4..d94471ea6a 100644 --- a/sys/libprop/prop_dictionary.c +++ b/sys/libprop/prop_dictionary.c @@ -73,9 +73,9 @@ struct _prop_dictionary_keysym { #define PDK_MAXKEY 128 -_PROP_POOL_INIT(_prop_dictionary_keysym16_pool, PDK_SIZE_16, "pdict16") -_PROP_POOL_INIT(_prop_dictionary_keysym32_pool, PDK_SIZE_32, "pdict32") -_PROP_POOL_INIT(_prop_dictionary_keysym128_pool, PDK_SIZE_128, "pdict128") +_PROP_POOL_INIT(_prop_dictionary_keysym16_pool, PDK_SIZE_16, "pdict16"); +_PROP_POOL_INIT(_prop_dictionary_keysym32_pool, PDK_SIZE_32, "pdict32"); +_PROP_POOL_INIT(_prop_dictionary_keysym128_pool, PDK_SIZE_128, "pdict128"); struct _prop_dict_entry { prop_dictionary_keysym_t pde_key; @@ -96,7 +96,7 @@ struct _prop_dictionary { #define PD_F_IMMUTABLE 0x01 /* dictionary is immutable */ _PROP_POOL_INIT(_prop_dictionary_pool, sizeof(struct _prop_dictionary), - "propdict") + "propdict"); _PROP_MALLOC_DEFINE(M_PROP_DICT, "prop dictionary", "property dictionary container object") diff --git a/sys/libprop/prop_number.c b/sys/libprop/prop_number.c index 616e1aa0a6..cbd84b816a 100644 --- a/sys/libprop/prop_number.c +++ b/sys/libprop/prop_number.c @@ -61,7 +61,7 @@ struct _prop_number { } pn_value; }; -_PROP_POOL_INIT(_prop_number_pool, sizeof(struct _prop_number), "propnmbr") +_PROP_POOL_INIT(_prop_number_pool, sizeof(struct _prop_number), "propnmbr"); static _prop_object_free_rv_t _prop_number_free(prop_stack_t, prop_object_t *); diff --git a/sys/libprop/prop_string.c b/sys/libprop/prop_string.c index 63e34405b0..303b0b040a 100644 --- a/sys/libprop/prop_string.c +++ b/sys/libprop/prop_string.c @@ -50,7 +50,7 @@ struct _prop_string { #define PS_F_NOCOPY 0x01 -_PROP_POOL_INIT(_prop_string_pool, sizeof(struct _prop_string), "propstng") +_PROP_POOL_INIT(_prop_string_pool, sizeof(struct _prop_string), "propstng"); _PROP_MALLOC_DEFINE(M_PROP_STRING, "prop string", "property string container object") diff --git a/sys/net/bpf.c b/sys/net/bpf.c index ef436b9938..1a82aa17a5 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1618,7 +1618,7 @@ bpf_drvuninit(void *unused) devfs_clone_bitmap_uninit(&DEVFS_CLONE_BITMAP(bpf)); } -SYSINIT(bpfdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bpf_drvinit,NULL) +SYSINIT(bpfdev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE+CDEV_MAJOR, bpf_drvinit, NULL); SYSUNINIT(bpfdev, SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bpf_drvuninit, NULL); #else /* !BPF */ diff --git a/sys/net/if.c b/sys/net/if.c index e34d96df10..cec3205ff0 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -145,9 +145,9 @@ static int if_stats_compat = 0; SYSCTL_INT(_net_link, OID_AUTO, stats_compat, CTLFLAG_RW, &if_stats_compat, 0, "Compat the old ifnet stats"); -SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_FIRST, ifinit, NULL) +SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_FIRST, ifinit, NULL); /* Must be after netisr_init */ -SYSINIT(ifnet, SI_SUB_PRE_DRIVERS, SI_ORDER_SECOND, ifnetinit, NULL) +SYSINIT(ifnet, SI_SUB_PRE_DRIVERS, SI_ORDER_SECOND, ifnetinit, NULL); static if_com_alloc_t *if_com_alloc[256]; static if_com_free_t *if_com_free[256]; diff --git a/sys/platform/pc32/apic/ioapic.c b/sys/platform/pc32/apic/ioapic.c index f756f0810e..fc3eb2ffd2 100644 --- a/sys/platform/pc32/apic/ioapic.c +++ b/sys/platform/pc32/apic/ioapic.c @@ -617,4 +617,4 @@ ioapic_sysinit(void *dummy __unused) lapic_fixup_noioapic(); } } -SYSINIT(ioapic, SI_BOOT2_IOAPIC, SI_ORDER_FIRST, ioapic_sysinit, NULL) +SYSINIT(ioapic, SI_BOOT2_IOAPIC, SI_ORDER_FIRST, ioapic_sysinit, NULL); diff --git a/sys/platform/pc32/apic/lapic.c b/sys/platform/pc32/apic/lapic.c index 6676765641..90cbe78d4d 100644 --- a/sys/platform/pc32/apic/lapic.c +++ b/sys/platform/pc32/apic/lapic.c @@ -772,4 +772,4 @@ lapic_sysinit(void *dummy __unused) icu_reinit_noioapic(); } } -SYSINIT(lapic, SI_BOOT2_LAPIC, SI_ORDER_FIRST, lapic_sysinit, NULL) +SYSINIT(lapic, SI_BOOT2_LAPIC, SI_ORDER_FIRST, lapic_sysinit, NULL); diff --git a/sys/platform/pc32/i386/autoconf.c b/sys/platform/pc32/i386/autoconf.c index c4d5d52f56..6f676cd7b1 100644 --- a/sys/platform/pc32/i386/autoconf.c +++ b/sys/platform/pc32/i386/autoconf.c @@ -212,7 +212,7 @@ cpu_rootconf(void) setroot(); #endif } -SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) +SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL); u_long bootdev = 0; /* not a cdev_t - encoding is different */ diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c index 46c49559d4..66693aa569 100644 --- a/sys/platform/pc32/i386/machdep.c +++ b/sys/platform/pc32/i386/machdep.c @@ -146,9 +146,9 @@ extern void ffs_rawread_setup(void); #endif /* DIRECTIO */ static void init_locks(void); -SYSINIT(cpu, SI_BOOT2_START_CPU, SI_ORDER_FIRST, cpu_startup, NULL) -SYSINIT(pic_finish, SI_BOOT2_FINISH_PIC, SI_ORDER_FIRST, pic_finish, NULL) -SYSINIT(cpu_finish, SI_BOOT2_FINISH_CPU, SI_ORDER_FIRST, cpu_finish, NULL) +SYSINIT(cpu, SI_BOOT2_START_CPU, SI_ORDER_FIRST, cpu_startup, NULL); +SYSINIT(pic_finish, SI_BOOT2_FINISH_PIC, SI_ORDER_FIRST, pic_finish, NULL); +SYSINIT(cpu_finish, SI_BOOT2_FINISH_CPU, SI_ORDER_FIRST, cpu_finish, NULL); int _udatasel, _ucodesel; u_int atdevbase; diff --git a/sys/platform/pc32/i386/mp_machdep.c b/sys/platform/pc32/i386/mp_machdep.c index dbce97dbbc..b50ce958a0 100644 --- a/sys/platform/pc32/i386/mp_machdep.c +++ b/sys/platform/pc32/i386/mp_machdep.c @@ -310,7 +310,7 @@ mp_start_aps(void *dummy __unused) mp_bsp_simple_setup(); } } -SYSINIT(startaps, SI_BOOT2_START_APS, SI_ORDER_FIRST, mp_start_aps, NULL) +SYSINIT(startaps, SI_BOOT2_START_APS, SI_ORDER_FIRST, mp_start_aps, NULL); /* * start each AP in our list @@ -1098,7 +1098,7 @@ ap_finish(void) kprintf("Active CPU Mask: %08x\n", smp_active_mask); } -SYSINIT(finishsmp, SI_BOOT2_FINISH_SMP, SI_ORDER_FIRST, ap_finish, NULL) +SYSINIT(finishsmp, SI_BOOT2_FINISH_SMP, SI_ORDER_FIRST, ap_finish, NULL); void cpu_send_ipiq(int dcpu) diff --git a/sys/platform/pc64/apic/ioapic.c b/sys/platform/pc64/apic/ioapic.c index 61cfd6cb32..e92b39cfcc 100644 --- a/sys/platform/pc64/apic/ioapic.c +++ b/sys/platform/pc64/apic/ioapic.c @@ -622,4 +622,4 @@ ioapic_sysinit(void *dummy __unused) lapic_fixup_noioapic(); } } -SYSINIT(ioapic, SI_BOOT2_IOAPIC, SI_ORDER_FIRST, ioapic_sysinit, NULL) +SYSINIT(ioapic, SI_BOOT2_IOAPIC, SI_ORDER_FIRST, ioapic_sysinit, NULL); diff --git a/sys/platform/pc64/apic/lapic.c b/sys/platform/pc64/apic/lapic.c index 7c28094188..1d7793c0a4 100644 --- a/sys/platform/pc64/apic/lapic.c +++ b/sys/platform/pc64/apic/lapic.c @@ -842,4 +842,4 @@ lapic_sysinit(void *dummy __unused) icu_reinit_noioapic(); } } -SYSINIT(lapic, SI_BOOT2_LAPIC, SI_ORDER_FIRST, lapic_sysinit, NULL) +SYSINIT(lapic, SI_BOOT2_LAPIC, SI_ORDER_FIRST, lapic_sysinit, NULL); diff --git a/sys/platform/pc64/x86_64/autoconf.c b/sys/platform/pc64/x86_64/autoconf.c index f81cfc680e..77018442c6 100644 --- a/sys/platform/pc64/x86_64/autoconf.c +++ b/sys/platform/pc64/x86_64/autoconf.c @@ -213,7 +213,7 @@ cpu_rootconf(void) setroot(); #endif } -SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) +SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL); u_long bootdev = 0; /* not a cdev_t - encoding is different */ diff --git a/sys/platform/pc64/x86_64/machdep.c b/sys/platform/pc64/x86_64/machdep.c index 0b5dff6b2a..4d0b1c9b45 100644 --- a/sys/platform/pc64/x86_64/machdep.c +++ b/sys/platform/pc64/x86_64/machdep.c @@ -151,9 +151,9 @@ extern void ffs_rawread_setup(void); #endif /* DIRECTIO */ static void init_locks(void); -SYSINIT(cpu, SI_BOOT2_START_CPU, SI_ORDER_FIRST, cpu_startup, NULL) -SYSINIT(pic_finish, SI_BOOT2_FINISH_PIC, SI_ORDER_FIRST, pic_finish, NULL) -SYSINIT(cpu_finish, SI_BOOT2_FINISH_CPU, SI_ORDER_FIRST, cpu_finish, NULL) +SYSINIT(cpu, SI_BOOT2_START_CPU, SI_ORDER_FIRST, cpu_startup, NULL); +SYSINIT(pic_finish, SI_BOOT2_FINISH_PIC, SI_ORDER_FIRST, pic_finish, NULL); +SYSINIT(cpu_finish, SI_BOOT2_FINISH_CPU, SI_ORDER_FIRST, cpu_finish, NULL); #ifdef DDB extern vm_offset_t ksym_start, ksym_end; diff --git a/sys/platform/pc64/x86_64/mp_machdep.c b/sys/platform/pc64/x86_64/mp_machdep.c index 5e29f99a19..b740d3f64d 100644 --- a/sys/platform/pc64/x86_64/mp_machdep.c +++ b/sys/platform/pc64/x86_64/mp_machdep.c @@ -337,7 +337,7 @@ mp_start_aps(void *dummy __unused) mp_bsp_simple_setup(); } } -SYSINIT(startaps, SI_BOOT2_START_APS, SI_ORDER_FIRST, mp_start_aps, NULL) +SYSINIT(startaps, SI_BOOT2_START_APS, SI_ORDER_FIRST, mp_start_aps, NULL); /* * start each AP in our list @@ -1201,7 +1201,7 @@ ap_finish(void) } } -SYSINIT(finishsmp, SI_BOOT2_FINISH_SMP, SI_ORDER_FIRST, ap_finish, NULL) +SYSINIT(finishsmp, SI_BOOT2_FINISH_SMP, SI_ORDER_FIRST, ap_finish, NULL); void cpu_send_ipiq(int dcpu) diff --git a/sys/platform/vkernel/i386/autoconf.c b/sys/platform/vkernel/i386/autoconf.c index c8a3cd73a7..2cff1b1341 100644 --- a/sys/platform/vkernel/i386/autoconf.c +++ b/sys/platform/vkernel/i386/autoconf.c @@ -261,7 +261,7 @@ cpu_rootconf(void) setroot(); #endif } -SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) +SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL); u_long bootdev = 0; /* not a cdev_t - encoding is different */ diff --git a/sys/platform/vkernel/i386/mp.c b/sys/platform/vkernel/i386/mp.c index e680de537f..60ae4be2d3 100644 --- a/sys/platform/vkernel/i386/mp.c +++ b/sys/platform/vkernel/i386/mp.c @@ -123,7 +123,7 @@ ap_finish(void) kprintf("Active CPU Mask: %08x\n", smp_active_mask); } -SYSINIT(finishsmp, SI_BOOT2_FINISH_SMP, SI_ORDER_FIRST, ap_finish, NULL) +SYSINIT(finishsmp, SI_BOOT2_FINISH_SMP, SI_ORDER_FIRST, ap_finish, NULL); void * diff --git a/sys/platform/vkernel/platform/systimer.c b/sys/platform/vkernel/platform/systimer.c index ec5a2a20b9..963522355b 100644 --- a/sys/platform/vkernel/platform/systimer.c +++ b/sys/platform/vkernel/platform/systimer.c @@ -140,7 +140,7 @@ cpu_initclocks(void *arg __unused) cputimer_register(&vkernel_cputimer); cputimer_select(&vkernel_cputimer, 0); } -SYSINIT(clocksvk, SI_BOOT2_CLOCKREG, SI_ORDER_FIRST, cpu_initclocks, NULL) +SYSINIT(clocksvk, SI_BOOT2_CLOCKREG, SI_ORDER_FIRST, cpu_initclocks, NULL); /* * Constructor to initialize timer->base and get an initial count. diff --git a/sys/platform/vkernel64/platform/systimer.c b/sys/platform/vkernel64/platform/systimer.c index 8713dda37f..5ef35fb99b 100644 --- a/sys/platform/vkernel64/platform/systimer.c +++ b/sys/platform/vkernel64/platform/systimer.c @@ -141,7 +141,7 @@ cpu_initclocks(void *arg __unused) cputimer_register(&vkernel_cputimer); cputimer_select(&vkernel_cputimer, 0); } -SYSINIT(clocksvk, SI_BOOT2_CLOCKREG, SI_ORDER_FIRST, cpu_initclocks, NULL) +SYSINIT(clocksvk, SI_BOOT2_CLOCKREG, SI_ORDER_FIRST, cpu_initclocks, NULL); /* * Constructor to initialize timer->base and get an initial count. diff --git a/sys/platform/vkernel64/x86_64/autoconf.c b/sys/platform/vkernel64/x86_64/autoconf.c index dcff98238d..467a477309 100644 --- a/sys/platform/vkernel64/x86_64/autoconf.c +++ b/sys/platform/vkernel64/x86_64/autoconf.c @@ -258,7 +258,7 @@ cpu_rootconf(void) setroot(); #endif } -SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) +SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL); u_long bootdev = 0; /* not a cdev_t - encoding is different */ diff --git a/sys/platform/vkernel64/x86_64/mp.c b/sys/platform/vkernel64/x86_64/mp.c index 5eb8092f5e..7dec8147d3 100644 --- a/sys/platform/vkernel64/x86_64/mp.c +++ b/sys/platform/vkernel64/x86_64/mp.c @@ -130,7 +130,7 @@ ap_finish(void) (long)CPUMASK_LOWMASK(smp_active_mask)); } -SYSINIT(finishsmp, SI_BOOT2_FINISH_SMP, SI_ORDER_FIRST, ap_finish, NULL) +SYSINIT(finishsmp, SI_BOOT2_FINISH_SMP, SI_ORDER_FIRST, ap_finish, NULL); void * start_ap(void *arg __unused) diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 1ada08020b..78e71c0106 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -282,7 +282,7 @@ struct sysinit { ident, \ #uniquifier \ }; \ - DATA_SET(sysinit_set,uniquifier ## _sys_init); + DATA_SET(sysinit_set,uniquifier ## _sys_init) #define SYSINIT(uniquifier, subsystem, order, func, ident) \ C_SYSINIT(uniquifier, subsystem, order, \ diff --git a/sys/sys/module.h b/sys/sys/module.h index 1669c388e8..ccfb486698 100644 --- a/sys/sys/module.h +++ b/sys/sys/module.h @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/sys/module.h,v 1.14.2.3 2002/03/17 11:07:45 alfred Exp $ - * $DragonFly: src/sys/sys/module.h,v 1.11 2006/12/23 00:27:03 swildner Exp $ */ #ifndef _SYS_MODULE_H_ @@ -120,7 +119,7 @@ struct mod_metadata { #define DECLARE_MODULE(name, data, sub, order) \ MODULE_METADATA(_md_##name, MDT_MODULE, &data, #name); \ - SYSINIT(name##module, sub, order, module_register_init, &data) \ + SYSINIT(name##module, sub, order, module_register_init, &data); \ struct __hack #define MODULE_VERSION(module, version) \ diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h index 7c4527911f..18cc222a93 100644 --- a/sys/sys/taskqueue.h +++ b/sys/sys/taskqueue.h @@ -141,7 +141,7 @@ taskqueue_define_##name(void *arg) \ } \ \ SYSINIT(taskqueue_##name, SI_SUB_CONFIGURE, SI_ORDER_SECOND, \ - taskqueue_define_##name, NULL) \ + taskqueue_define_##name, NULL); \ \ struct __hack diff --git a/sys/vfs/devfs/devfs_rules.c b/sys/vfs/devfs/devfs_rules.c index 75fef0f555..b6f117e3e5 100644 --- a/sys/vfs/devfs/devfs_rules.c +++ b/sys/vfs/devfs/devfs_rules.c @@ -484,6 +484,6 @@ devfs_dev_uninit(void *unused) } -SYSINIT(devfsdev,SI_SUB_DRIVERS,SI_ORDER_FIRST,devfs_dev_init,NULL) +SYSINIT(devfsdev,SI_SUB_DRIVERS,SI_ORDER_FIRST,devfs_dev_init,NULL); SYSUNINIT(devfsdev, SI_SUB_DRIVERS,SI_ORDER_FIRST,devfs_dev_uninit, NULL); diff --git a/sys/vfs/ufs/ufs_dirhash.c b/sys/vfs/ufs/ufs_dirhash.c index 3abdd8bab2..32b6613ae7 100644 --- a/sys/vfs/ufs/ufs_dirhash.c +++ b/sys/vfs/ufs/ufs_dirhash.c @@ -977,7 +977,7 @@ ufsdirhash_init(void) DH_NBLKOFF * sizeof(daddr_t)); TAILQ_INIT(&ufsdirhash_list); } -SYSINIT(ufsdirhash, SI_SUB_PSEUDO, SI_ORDER_ANY, ufsdirhash_init, NULL) +SYSINIT(ufsdirhash, SI_SUB_PSEUDO, SI_ORDER_ANY, ufsdirhash_init, NULL); #endif /* UFS_DIRHASH */ diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 3181c89dd8..5872a6c049 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -331,7 +331,7 @@ swap_pager_init(void *arg __unused) dmmax = SWB_NPAGES * 2; dmmax_mask = ~(dmmax - 1); } -SYSINIT(vm_mem, SI_BOOT1_VM, SI_ORDER_THIRD, swap_pager_init, NULL) +SYSINIT(vm_mem, SI_BOOT1_VM, SI_ORDER_THIRD, swap_pager_init, NULL); /* * SWAP_PAGER_SWAP_INIT() - swap pager initialization from pageout process diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index cc7b8fb619..54a48af8dc 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -98,7 +98,7 @@ * Note: run scheduling should be divorced from the vm system. */ static void scheduler (void *); -SYSINIT(scheduler, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, scheduler, NULL) +SYSINIT(scheduler, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, scheduler, NULL); #ifdef INVARIANTS diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 88cf95f004..4cf51bb622 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -60,7 +60,6 @@ * rights to redistribute these changes. * * $FreeBSD: src/sys/vm/vm_init.c,v 1.20 1999/10/29 18:09:29 phk Exp $ - * $DragonFly: src/sys/vm/vm_init.c,v 1.11 2007/04/30 07:18:57 dillon Exp $ */ /* @@ -83,7 +82,7 @@ * Initialize the VM system */ static void vm_mem_init (void *); -SYSINIT(vm_mem, SI_BOOT1_VM, SI_ORDER_FIRST, vm_mem_init, NULL) +SYSINIT(vm_mem, SI_BOOT1_VM, SI_ORDER_FIRST, vm_mem_init, NULL); /* * vm_init initializes the virtual memory system. diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 7e47102f9f..31bd309224 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -94,7 +94,7 @@ SYSCTL_INT(_vm, OID_AUTO, vkernel_enable, CTLFLAG_RW, &vkernel_enable, 0, ""); */ static void vmmapentry_rsrc_init (void *); -SYSINIT(vmmersrc, SI_BOOT1_POST, SI_ORDER_ANY, vmmapentry_rsrc_init, NULL) +SYSINIT(vmmersrc, SI_BOOT1_POST, SI_ORDER_ANY, vmmapentry_rsrc_init, NULL); static void vmmapentry_rsrc_init(void *dummy) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index a14e3aaba5..57dca8d46b 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -499,7 +499,7 @@ vm_page_startup_finish(void *dummy __unused) (intmax_t)vm_contig_alist.bl_free * (PAGE_SIZE / 1024)); } SYSINIT(vm_pgend, SI_SUB_PROC0_POST, SI_ORDER_ANY, - vm_page_startup_finish, NULL) + vm_page_startup_finish, NULL); /* diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 9fdf6f396c..c3755c5b09 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -114,7 +114,7 @@ static struct kproc_desc vm_kp = { vm_daemon, &vmthread }; -SYSINIT(vmdaemon, SI_SUB_KTHREAD_VM, SI_ORDER_FIRST, kproc_start, &vm_kp) +SYSINIT(vmdaemon, SI_SUB_KTHREAD_VM, SI_ORDER_FIRST, kproc_start, &vm_kp); #endif int vm_pages_needed=0; /* Event on which pageout daemon sleeps */ @@ -2030,7 +2030,7 @@ static struct kproc_desc page_kp = { vm_pageout_thread, &pagethread }; -SYSINIT(pagedaemon, SI_SUB_KTHREAD_PAGE, SI_ORDER_FIRST, kproc_start, &page_kp) +SYSINIT(pagedaemon, SI_SUB_KTHREAD_PAGE, SI_ORDER_FIRST, kproc_start, &page_kp); /* diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index 85ef704331..9d01a6559e 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -204,7 +204,7 @@ vm_pager_init(void *arg __unused) TAILQ_INIT(&bswlist_raw); TAILQ_INIT(&bswlist_kva); } -SYSINIT(vm_mem, SI_BOOT1_VM, SI_ORDER_SECOND, vm_pager_init, NULL) +SYSINIT(vm_mem, SI_BOOT1_VM, SI_ORDER_SECOND, vm_pager_init, NULL); /* * Called from the low level boot code only. diff --git a/sys/vm/vm_swapcache.c b/sys/vm/vm_swapcache.c index d36491fe57..1ec6e276b3 100644 --- a/sys/vm/vm_swapcache.c +++ b/sys/vm/vm_swapcache.c @@ -334,7 +334,7 @@ static struct kproc_desc swpc_kp = { vm_swapcached_thread, &swapcached_thread }; -SYSINIT(swapcached, SI_SUB_KTHREAD_PAGE, SI_ORDER_SECOND, kproc_start, &swpc_kp) +SYSINIT(swapcached, SI_SUB_KTHREAD_PAGE, SI_ORDER_SECOND, kproc_start, &swpc_kp); /* * Deal with an overflow of the heuristic counter or if the user -- 2.41.0