diff options
author | rwatson <rwatson@FreeBSD.org> | 2008-03-16 10:58:09 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2008-03-16 10:58:09 +0000 |
commit | 877d7c65ba9b74233df6c9197fc39c770e809d02 (patch) | |
tree | 6564575d1252cf3bc48428a52fcc596c284e459b /sys/kern | |
parent | e16eb855ef66b817fb04637d522ca52a5e5b5163 (diff) | |
download | FreeBSD-src-877d7c65ba9b74233df6c9197fc39c770e809d02.zip FreeBSD-src-877d7c65ba9b74233df6c9197fc39c770e809d02.tar.gz |
In keeping with style(9)'s recommendations on macros, use a ';'
after each SYSINIT() macro invocation. This makes a number of
lightweight C parsers much happier with the FreeBSD kernel
source, including cflow's prcc and lxr.
MFC after: 1 month
Discussed with: imp, rink
Diffstat (limited to 'sys/kern')
38 files changed, 74 insertions, 64 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index eba81cb..d476904 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -109,7 +109,7 @@ SYSCTL_INT(_debug, OID_AUTO, bootverbose, CTLFLAG_RW, &bootverbose, 0, ""); * symbol is not undefined. A sybsystem ID of SI_SUB_DUMMY is never * executed. */ -SYSINIT(placeholder, SI_SUB_DUMMY, SI_ORDER_ANY, NULL, NULL) +SYSINIT(placeholder, SI_SUB_DUMMY, SI_ORDER_ANY, NULL, NULL); /* * The sysinit table itself. Items are checked off as the are run. @@ -288,26 +288,28 @@ print_caddr_t(void *data __unused) { printf("%s", (char *)data); } -SYSINIT(announce, SI_SUB_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t, copyright) -SYSINIT(trademark, SI_SUB_COPYRIGHT, SI_ORDER_SECOND, print_caddr_t, trademark) -SYSINIT(version, SI_SUB_COPYRIGHT, SI_ORDER_THIRD, print_caddr_t, version) +SYSINIT(announce, SI_SUB_COPYRIGHT, SI_ORDER_FIRST, print_caddr_t, + copyright); +SYSINIT(trademark, SI_SUB_COPYRIGHT, SI_ORDER_SECOND, print_caddr_t, + trademark); +SYSINIT(version, SI_SUB_COPYRIGHT, SI_ORDER_THIRD, print_caddr_t, version); #ifdef WITNESS static char wit_warn[] = "WARNING: WITNESS option enabled, expect reduced performance.\n"; SYSINIT(witwarn, SI_SUB_COPYRIGHT, SI_ORDER_THIRD + 1, - print_caddr_t, wit_warn) + print_caddr_t, wit_warn); SYSINIT(witwarn2, SI_SUB_RUN_SCHEDULER, SI_ORDER_THIRD + 1, - print_caddr_t, wit_warn) + print_caddr_t, wit_warn); #endif #ifdef DIAGNOSTIC static char diag_warn[] = "WARNING: DIAGNOSTIC option enabled, expect reduced performance.\n"; SYSINIT(diagwarn, SI_SUB_COPYRIGHT, SI_ORDER_THIRD + 2, - print_caddr_t, diag_warn) + print_caddr_t, diag_warn); SYSINIT(diagwarn2, SI_SUB_RUN_SCHEDULER, SI_ORDER_THIRD + 2, - print_caddr_t, diag_warn) + print_caddr_t, diag_warn); #endif static void @@ -317,7 +319,7 @@ set_boot_verbose(void *data __unused) if (boothowto & RB_VERBOSE) bootverbose++; } -SYSINIT(boot_verbose, SI_SUB_TUNABLES, SI_ORDER_ANY, set_boot_verbose, NULL) +SYSINIT(boot_verbose, SI_SUB_TUNABLES, SI_ORDER_ANY, set_boot_verbose, NULL); struct sysentvec null_sysvec = { 0, @@ -507,7 +509,7 @@ proc0_init(void *dummy __unused) */ (void)chgproccnt(p->p_ucred->cr_ruidinfo, 1, 0); } -SYSINIT(p0init, SI_SUB_INTRINSIC, SI_ORDER_FIRST, proc0_init, NULL) +SYSINIT(p0init, SI_SUB_INTRINSIC, SI_ORDER_FIRST, proc0_init, NULL); /* ARGSUSED*/ static void @@ -546,7 +548,7 @@ proc0_post(void *dummy __unused) nanotime(&ts); srandom(ts.tv_sec ^ ts.tv_nsec); } -SYSINIT(p0post, SI_SUB_INTRINSIC_POST, SI_ORDER_FIRST, proc0_post, NULL) +SYSINIT(p0post, SI_SUB_INTRINSIC_POST, SI_ORDER_FIRST, proc0_post, NULL); /* *************************************************************************** @@ -744,7 +746,7 @@ create_init(const void *udata __unused) cred_update_thread(FIRST_THREAD_IN_PROC(initproc)); cpu_set_fork_handler(FIRST_THREAD_IN_PROC(initproc), start_init, NULL); } -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. @@ -760,4 +762,4 @@ kick_init(const void *udata __unused) sched_add(td, SRQ_BORING); thread_unlock(td); } -SYSINIT(kickinit, SI_SUB_KTHREAD_INIT, SI_ORDER_FIRST, kick_init, NULL) +SYSINIT(kickinit, SI_SUB_KTHREAD_INIT, SI_ORDER_FIRST, kick_init, NULL); diff --git a/sys/kern/kern_alq.c b/sys/kern/kern_alq.c index 3f027ab..7a57fb4 100644 --- a/sys/kern/kern_alq.c +++ b/sys/kern/kern_alq.c @@ -327,8 +327,8 @@ static struct kproc_desc ald_kp = { &ald_proc }; -SYSINIT(aldthread, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, kproc_start, &ald_kp) -SYSINIT(ald, SI_SUB_LOCK, SI_ORDER_ANY, ald_startup, NULL) +SYSINIT(aldthread, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, kproc_start, &ald_kp); +SYSINIT(ald, SI_SUB_LOCK, SI_ORDER_ANY, ald_startup, NULL); /* User visible queue functions */ diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index c92d7de..ded86c8 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -79,7 +79,7 @@ extern void hardclock_device_poll(void); #endif /* DEVICE_POLLING */ static void initclocks(void *dummy); -SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL) +SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL); /* Spin-lock protecting profiling statistics. */ static struct mtx time_lock; diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 683da72..4fec4d6 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2850,7 +2850,7 @@ filelistinit(void *dummy) mtx_init(&sigio_lock, "sigio lock", NULL, MTX_DEF); mtx_init(&fdesc_mtx, "fdesc", NULL, MTX_DEF); } -SYSINIT(select, SI_SUB_EVENTHANDLER+1, SI_ORDER_MIDDLE, filelistinit, NULL) +SYSINIT(select, SI_SUB_EVENTHANDLER+1, SI_ORDER_MIDDLE, filelistinit, NULL); /*-------------------------------------------------------------------*/ @@ -2965,4 +2965,4 @@ fildesc_drvinit(void *unused) make_dev_alias(dev, "stderr"); } -SYSINIT(fildescdev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, fildesc_drvinit, NULL) +SYSINIT(fildescdev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, fildesc_drvinit, NULL); diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 171a150..cfdb9b1 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1922,7 +1922,7 @@ knote_init(void) knote_zone = uma_zcreate("KNOTE", sizeof(struct knote), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); } -SYSINIT(knote, SI_SUB_PSEUDO, SI_ORDER_ANY, knote_init, NULL) +SYSINIT(knote, SI_SUB_PSEUDO, SI_ORDER_ANY, knote_init, NULL); static struct knote * knote_alloc(int waitok) diff --git a/sys/kern/kern_idle.c b/sys/kern/kern_idle.c index 953297b..1d9b302 100644 --- a/sys/kern/kern_idle.c +++ b/sys/kern/kern_idle.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #endif static void idle_setup(void *dummy); -SYSINIT(idle_setup, SI_SUB_SCHED_IDLE, SI_ORDER_FIRST, idle_setup, NULL) +SYSINIT(idle_setup, SI_SUB_SCHED_IDLE, SI_ORDER_FIRST, idle_setup, NULL); /* * Set up per-cpu idle process contexts. The AP's shouldn't be running or diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 3d02073..9114430 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -1600,7 +1600,8 @@ start_softintr(void *dummy) p->p_flag |= P_NOLOAD; PROC_UNLOCK(p); } -SYSINIT(start_softintr, SI_SUB_SOFTINTR, SI_ORDER_FIRST, start_softintr, NULL) +SYSINIT(start_softintr, SI_SUB_SOFTINTR, SI_ORDER_FIRST, start_softintr, + NULL); /* * Sysctls used by systat and others: hw.intrnames and hw.intrcnt. diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 2365d0b..45d7653 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -162,7 +162,7 @@ linker_init(void *arg) TAILQ_INIT(&linker_files); } -SYSINIT(linker, SI_SUB_KLD, SI_ORDER_FIRST, linker_init, 0) +SYSINIT(linker, SI_SUB_KLD, SI_ORDER_FIRST, linker_init, 0); static void linker_stop_class_add(void *arg) @@ -171,7 +171,7 @@ linker_stop_class_add(void *arg) linker_no_more_classes = 1; } -SYSINIT(linker_class, SI_SUB_KLD, SI_ORDER_ANY, linker_stop_class_add, NULL) +SYSINIT(linker_class, SI_SUB_KLD, SI_ORDER_ANY, linker_stop_class_add, NULL); int linker_add_class(linker_class_t lc) @@ -363,7 +363,8 @@ linker_init_kernel_modules(void) linker_file_register_modules(linker_kernel_file); } -SYSINIT(linker_kernel, SI_SUB_KLD, SI_ORDER_ANY, linker_init_kernel_modules, 0) +SYSINIT(linker_kernel, SI_SUB_KLD, SI_ORDER_ANY, linker_init_kernel_modules, + 0); static int linker_load_file(const char *filename, linker_file_t *result) @@ -1559,7 +1560,7 @@ restart: /* woohoo! we made it! */ } -SYSINIT(preload, SI_SUB_KLD, SI_ORDER_MIDDLE, linker_preload, 0) +SYSINIT(preload, SI_SUB_KLD, SI_ORDER_MIDDLE, linker_preload, 0); /* * Search for a not-loaded module by name. diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index ee5d370..20c9fff 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -107,7 +107,7 @@ MALLOC_DEFINE(M_IP6OPT, "ip6opt", "IPv6 options"); MALLOC_DEFINE(M_IP6NDP, "ip6ndp", "IPv6 Neighbor Discovery"); static void kmeminit(void *); -SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL) +SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL); static MALLOC_DEFINE(M_FREE, "free", "should be on free list"); diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 275b92d..4cdb12e 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -238,7 +238,7 @@ CTASSERT((((MSIZE - 1) ^ MSIZE) + 1) >> 1 == MSIZE); /* * Initialize FreeBSD Network buffer allocation. */ -SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbuf_init, NULL) +SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbuf_init, NULL); static void mbuf_init(void *dummy) { diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index 72a6991..e2c02b8 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -90,7 +90,7 @@ module_init(void *arg) SHUTDOWN_PRI_DEFAULT); } -SYSINIT(module, SI_SUB_KLD, SI_ORDER_FIRST, module_init, 0) +SYSINIT(module, SI_SUB_KLD, SI_ORDER_FIRST, module_init, 0); static void module_shutdown(void *arg1, int arg2) diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c index 30cb4b1..2d87740 100644 --- a/sys/kern/kern_ntptime.c +++ b/sys/kern/kern_ntptime.c @@ -630,7 +630,7 @@ ntp_init() #endif /* PPS_SYNC */ } -SYSINIT(ntpclocks, SI_SUB_CLOCKS, SI_ORDER_MIDDLE, ntp_init, NULL) +SYSINIT(ntpclocks, SI_SUB_CLOCKS, SI_ORDER_MIDDLE, ntp_init, NULL); /* * hardupdate() - local clock update diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c index a908f00..95d6e41 100644 --- a/sys/kern/kern_poll.c +++ b/sys/kern/kern_poll.c @@ -267,7 +267,7 @@ init_device_poll(void) netisr_register(NETISR_POLLMORE, (netisr_t *)netisr_pollmore, NULL, NETISR_MPSAFE); } -SYSINIT(device_poll, SI_SUB_CLOCKS, SI_ORDER_MIDDLE, init_device_poll, NULL) +SYSINIT(device_poll, SI_SUB_CLOCKS, SI_ORDER_MIDDLE, init_device_poll, NULL); /* @@ -593,4 +593,5 @@ static struct kproc_desc idlepoll_kp = { poll_idle, &idlepoll }; -SYSINIT(idlepoll, SI_SUB_KTHREAD_VM, SI_ORDER_ANY, kproc_start, &idlepoll_kp) +SYSINIT(idlepoll, SI_SUB_KTHREAD_VM, SI_ORDER_ANY, kproc_start, + &idlepoll_kp); diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 8f25af4..6c3d82d 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -150,7 +150,7 @@ shutdown_conf(void *unused) SHUTDOWN_PRI_LAST + 200); } -SYSINIT(shutdown_conf, SI_SUB_INTRINSIC, SI_ORDER_ANY, shutdown_conf, NULL) +SYSINIT(shutdown_conf, SI_SUB_INTRINSIC, SI_ORDER_ANY, shutdown_conf, NULL); /* * The system call that results in a reboot. diff --git a/sys/kern/kern_switch.c b/sys/kern/kern_switch.c index 360a993..caab072 100644 --- a/sys/kern/kern_switch.c +++ b/sys/kern/kern_switch.c @@ -288,7 +288,7 @@ printf_caddr_t(void *data) static char preempt_warning[] = "WARNING: Kernel preemption is disabled, expect reduced performance.\n"; SYSINIT(preempt_warning, SI_SUB_COPYRIGHT, SI_ORDER_ANY, printf_caddr_t, - preempt_warning) + preempt_warning); #endif #endif diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 71764e5..6914aa4 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -65,7 +65,8 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> static void synch_setup(void *dummy); -SYSINIT(synch_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, synch_setup, NULL) +SYSINIT(synch_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, synch_setup, + NULL); int hogticks; int lbolt; diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 7e8ed43..c84054b 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -833,7 +833,7 @@ inittimecounter(void *dummy) (void)timecounter->tc_get_timecount(timecounter); } -SYSINIT(timecounter, SI_SUB_CLOCKS, SI_ORDER_SECOND, inittimecounter, NULL) +SYSINIT(timecounter, SI_SUB_CLOCKS, SI_ORDER_SECOND, inittimecounter, NULL); /* Cpu tick handling -------------------------------------------------*/ diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index 17ae0be..ed906b6 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -127,8 +127,9 @@ static struct kproc_desc sched_kp = { schedcpu_thread, NULL }; -SYSINIT(schedcpu, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, kproc_start, &sched_kp) -SYSINIT(sched_setup, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, sched_setup, NULL) +SYSINIT(schedcpu, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, kproc_start, + &sched_kp); +SYSINIT(sched_setup, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, sched_setup, NULL); /* * Global run queue. diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index eb9f736..8bfec8d 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -284,10 +284,11 @@ static struct mtx *sched_switch_migrate(struct tdq *, struct thread *, int); #endif static void sched_setup(void *dummy); -SYSINIT(sched_setup, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, sched_setup, NULL) +SYSINIT(sched_setup, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, sched_setup, NULL); static void sched_initticks(void *dummy); -SYSINIT(sched_initticks, SI_SUB_CLOCKS, SI_ORDER_THIRD, sched_initticks, NULL) +SYSINIT(sched_initticks, SI_SUB_CLOCKS, SI_ORDER_THIRD, sched_initticks, + NULL); /* * Print the threads waiting on a run-queue. diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index 8f8a72f..ef70f04 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -79,7 +79,7 @@ run_interrupt_driven_config_hooks(dummy) mtx_unlock(&intr_config_hook_lock); } 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_clist.c b/sys/kern/subr_clist.c index f0dc88d..5b53efa 100644 --- a/sys/kern/subr_clist.c +++ b/sys/kern/subr_clist.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <sys/clist.h> 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 = 0; int cfreecount = 0; diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c index 885c013..f9c8ead 100644 --- a/sys/kern/subr_eventhandler.c +++ b/sys/kern/subr_eventhandler.c @@ -62,7 +62,7 @@ eventhandler_init(void *dummy __unused) atomic_store_rel_int(&eventhandler_lists_initted, 1); } SYSINIT(eventhandlers, SI_SUB_EVENTHANDLER, SI_ORDER_FIRST, eventhandler_init, - NULL) + NULL); /* * Insertion is O(n) due to the priority scan, but optimises to O(1) diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index cd9a70a..01a3acc 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -250,4 +250,4 @@ log_drvinit(void *unused) make_dev(&log_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "klog"); } -SYSINIT(logdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,log_drvinit,NULL) +SYSINIT(logdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,log_drvinit,NULL); diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index 8da12ac..5a70482 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); static MALLOC_DEFINE(M_GPROF, "gprof", "kernel profiling buffer"); static void kmstartup(void *); -SYSINIT(kmem, SI_SUB_KPROF, SI_ORDER_FIRST, kmstartup, NULL) +SYSINIT(kmem, SI_SUB_KPROF, SI_ORDER_FIRST, kmstartup, NULL); struct gmonparam _gmonparam = { GMON_PROF_OFF }; @@ -574,7 +574,7 @@ tcov_init(void *foo __unused) } } -SYSINIT(tcov_init, SI_SUB_KPROF, SI_ORDER_SECOND, tcov_init, NULL) +SYSINIT(tcov_init, SI_SUB_KPROF, SI_ORDER_SECOND, tcov_init, NULL); /* * GCC contains magic to recognize calls to for instance execve() and diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index b55cbb6..2d07756 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -130,7 +130,7 @@ mp_setmaxid(void *dummy) { cpu_mp_setmaxid(); } -SYSINIT(cpu_mp_setmaxid, SI_SUB_TUNABLES, SI_ORDER_FIRST, mp_setmaxid, NULL) +SYSINIT(cpu_mp_setmaxid, SI_SUB_TUNABLES, SI_ORDER_FIRST, mp_setmaxid, NULL); /* * Call the MD SMP initialization code. @@ -152,7 +152,7 @@ mp_start(void *dummy) mp_ncpus); cpu_mp_announce(); } -SYSINIT(cpu_mp, SI_SUB_CPU, SI_ORDER_THIRD, mp_start, NULL) +SYSINIT(cpu_mp, SI_SUB_CPU, SI_ORDER_THIRD, mp_start, NULL); void forward_signal(struct thread *td) @@ -593,5 +593,5 @@ mp_setvariables_for_up(void *dummy) KASSERT(PCPU_GET(cpuid) == 0, ("UP must have a CPU ID of zero")); } SYSINIT(cpu_mp_setvariables, SI_SUB_TUNABLES, SI_ORDER_FIRST, - mp_setvariables_for_up, NULL) + mp_setvariables_for_up, NULL); #endif /* SMP */ diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index b213766..e2c7d6b 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -564,7 +564,8 @@ witness_initialize(void *dummy __unused) mtx_lock(&Giant); } -SYSINIT(witness_init, SI_SUB_WITNESS, SI_ORDER_FIRST, witness_initialize, NULL) +SYSINIT(witness_init, SI_SUB_WITNESS, SI_ORDER_FIRST, witness_initialize, + NULL); static int sysctl_debug_witness_watch(SYSCTL_HANDLER_ARGS) diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index 3405aa7..624ae85 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -731,4 +731,4 @@ cn_drvinit(void *unused) use_cnputs_mtx = 1; } -SYSINIT(cndev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, cn_drvinit, NULL) +SYSINIT(cndev, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, cn_drvinit, NULL); diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c index 8aff29e..03f3e94 100644 --- a/sys/kern/tty_pts.c +++ b/sys/kern/tty_pts.c @@ -914,4 +914,4 @@ pty_drvinit(void *unused) EVENTHANDLER_REGISTER(dev_clone, pty_clone, 0, 1000); } -SYSINIT(ptydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,pty_drvinit,NULL) +SYSINIT(ptydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,pty_drvinit,NULL); diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 0e1bc26..5d28fe6 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -795,4 +795,4 @@ ptc_drvinit(void *unused) EVENTHANDLER_REGISTER(dev_clone, pty_clone, 0, 1000); } -SYSINIT(ptcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,ptc_drvinit,NULL) +SYSINIT(ptcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,ptc_drvinit,NULL); diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index f0dc88d..5b53efa 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <sys/clist.h> 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 = 0; int cfreecount = 0; diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index 0b10f83..f544347 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -93,4 +93,4 @@ ctty_drvinit(void *unused) ctty = make_dev(&ctty_cdevsw, 0, 0, 0, 0666, "ctty"); } -SYSINIT(cttydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,ctty_drvinit,NULL) +SYSINIT(cttydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,ctty_drvinit,NULL); diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 4c326d3..12bee2b 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -58,11 +58,11 @@ __FBSDID("$FreeBSD$"); */ 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 domainfinalize(void *); SYSINIT(domainfin, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_FIRST, domainfinalize, - NULL) + NULL); static struct callout pffast_callout; static struct callout pfslow_callout; diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index 6701864..fd681f9 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -428,4 +428,4 @@ aclinit(void *dummy __unused) acl_zone = uma_zcreate("ACL UMA zone", sizeof(struct acl), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); } -SYSINIT(acls, SI_SUB_ACL, SI_ORDER_FIRST, aclinit, NULL) +SYSINIT(acls, SI_SUB_ACL, SI_ORDER_FIRST, aclinit, NULL); diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index cf0ea46..df7f8a6 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -2036,7 +2036,7 @@ static struct kproc_desc buf_kp = { buf_daemon, &bufdaemonproc }; -SYSINIT(bufdaemon, SI_SUB_KTHREAD_BUF, SI_ORDER_FIRST, kproc_start, &buf_kp) +SYSINIT(bufdaemon, SI_SUB_KTHREAD_BUF, SI_ORDER_FIRST, kproc_start, &buf_kp); static void buf_daemon() diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index dd8b97c..6e49a1b 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -561,7 +561,7 @@ nchinit(void *dummy __unused) nchashtbl = hashinit(desiredvnodes * 2, M_VFSCACHE, &nchash); } -SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nchinit, NULL) +SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nchinit, NULL); /* diff --git a/sys/kern/vfs_hash.c b/sys/kern/vfs_hash.c index cfdab1b..aad22e0 100644 --- a/sys/kern/vfs_hash.c +++ b/sys/kern/vfs_hash.c @@ -52,7 +52,7 @@ vfs_hashinit(void *dummy __unused) } /* Must be SI_ORDER_SECOND so desiredvnodes is available */ -SYSINIT(vfs_hash, SI_SUB_VFS, SI_ORDER_SECOND, vfs_hashinit, NULL) +SYSINIT(vfs_hash, SI_SUB_VFS, SI_ORDER_SECOND, vfs_hashinit, NULL); static struct vfs_hash_head * vfs_hash_index(const struct mount *mp, u_int hash) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 67ee6cb..c04916b 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -86,7 +86,7 @@ nameiinit(void *dummy __unused) panic("nameiinit: getnewvnode"); VN_LOCK_ASHARE(vp_crossmp); } -SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL) +SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL); #ifdef LOOKUP_SHARED static int lookup_shared = 1; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 171d73b..a0df9e6 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -321,7 +321,7 @@ vntblinit(void *dummy __unused) syncer_maxdelay = syncer_mask + 1; mtx_init(&sync_mtx, "Syncer mtx", NULL, MTX_DEF); } -SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vntblinit, NULL) +SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vntblinit, NULL); /* @@ -780,7 +780,8 @@ static struct kproc_desc vnlru_kp = { vnlru_proc, &vnlruproc }; -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); /* * Routines having to do with the management of the vnode table. @@ -1609,7 +1610,7 @@ static struct kproc_desc up_kp = { sched_sync, &updateproc }; -SYSINIT(syncer, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, &up_kp) +SYSINIT(syncer, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, &up_kp); static int sync_vnode(struct synclist *slp, struct bufobj **bo, struct thread *td) |