diff options
89 files changed, 144 insertions, 128 deletions
diff --git a/sys/amd64/acpica/madt.c b/sys/amd64/acpica/madt.c index 3ed1ea7..7bcf0e6 100644 --- a/sys/amd64/acpica/madt.c +++ b/sys/amd64/acpica/madt.c @@ -409,7 +409,7 @@ madt_register(void *dummy __unused) apic_register_enumerator(&madt_enumerator); } SYSINIT(madt_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, - madt_register, NULL) + madt_register, NULL); /* * Call the handler routine for each entry in the MADT table. @@ -779,4 +779,4 @@ madt_set_ids(void *dummy) la->la_acpi_id); } } -SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL) +SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL); diff --git a/sys/amd64/amd64/intr_machdep.c b/sys/amd64/amd64/intr_machdep.c index 23d9278..a160822 100644 --- a/sys/amd64/amd64/intr_machdep.c +++ b/sys/amd64/amd64/intr_machdep.c @@ -510,7 +510,7 @@ intr_init(void *dummy __unused) sx_init(&intr_table_lock, "intr sources"); mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN); } -SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) +SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL); #ifndef DEV_ATPIC /* Initialize the two 8259A's to a known-good shutdown state. */ @@ -642,5 +642,6 @@ intr_shuffle_irqs(void *arg __unused) } sx_xunlock(&intr_table_lock); } -SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) +SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, + NULL); #endif diff --git a/sys/amd64/amd64/local_apic.c b/sys/amd64/amd64/local_apic.c index d201310..9a3ec2a 100644 --- a/sys/amd64/amd64/local_apic.c +++ b/sys/amd64/amd64/local_apic.c @@ -1039,7 +1039,7 @@ apic_init(void *dummy __unused) printf("%s: Failed to probe CPUs: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_init, SI_SUB_TUNABLES - 1, SI_ORDER_SECOND, apic_init, NULL) +SYSINIT(apic_init, SI_SUB_TUNABLES - 1, SI_ORDER_SECOND, apic_init, NULL); /* * Setup the local APIC. We have to do this prior to starting up the APs @@ -1057,7 +1057,8 @@ apic_setup_local(void *dummy __unused) printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, NULL) +SYSINIT(apic_setup_local, SI_SUB_CPU, SI_ORDER_SECOND, apic_setup_local, + NULL); /* * Setup the I/O APICs. @@ -1086,7 +1087,7 @@ apic_setup_io(void *dummy __unused) /* Enable the MSI "pic". */ msi_init(); } -SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL) +SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL); #ifdef SMP /* diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 2e03579..8873231 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -149,7 +149,7 @@ extern void panicifcpuunsupported(void); static void cpu_startup(void *); static void get_fpcontext(struct thread *td, mcontext_t *mcp); static int set_fpcontext(struct thread *td, const mcontext_t *mcp); -SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) +SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); #ifdef DDB extern vm_offset_t ksym_start, ksym_end; diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index c57fa2d..01cb093 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -381,7 +381,7 @@ mptable_register(void *dummy __unused) apic_register_enumerator(&mptable_enumerator); } SYSINIT(mptable_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, - mptable_register, NULL) + mptable_register, NULL); /* * Call the handler routine for each entry in the MP config table. diff --git a/sys/amd64/isa/atpic.c b/sys/amd64/isa/atpic.c index d9792eb..3512091 100644 --- a/sys/amd64/isa/atpic.c +++ b/sys/amd64/isa/atpic.c @@ -499,7 +499,7 @@ atpic_init(void *dummy __unused) intr_register_source(&ai->at_intsrc); } } -SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL) +SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL); void atpic_handle_intr(u_int vector, struct trapframe *frame) diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index 110d7a6..dde35e4 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -308,7 +308,7 @@ cpu_startup(void *dummy) #endif } -SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) +SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); /* Get current clock frequency for the given cpu id. */ int diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c index 675927c..4557b0f 100644 --- a/sys/arm/arm/vm_machdep.c +++ b/sys/arm/arm/vm_machdep.c @@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$"); #ifndef ARM_USE_SMALL_ALLOC static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) +SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL); LIST_HEAD(sf_head, sf_buf); diff --git a/sys/cddl/contrib/opensolaris/uts/common/os/callb.c b/sys/cddl/contrib/opensolaris/uts/common/os/callb.c index 9bfae13..c6e357e 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/os/callb.c +++ b/sys/cddl/contrib/opensolaris/uts/common/os/callb.c @@ -359,5 +359,5 @@ callb_unlock_table(void) mutex_exit(&ct->ct_lock); } -SYSINIT(sol_callb, SI_SUB_DRIVERS, SI_ORDER_FIRST, callb_init, NULL) +SYSINIT(sol_callb, SI_SUB_DRIVERS, SI_ORDER_FIRST, callb_init, NULL); SYSUNINIT(sol_callb, SI_SUB_DRIVERS, SI_ORDER_FIRST, callb_fini, NULL); diff --git a/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c b/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c index 220f080..1558c1f 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c +++ b/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c @@ -1016,5 +1016,5 @@ taskq_destroy(taskq_t *tq) kmem_cache_free(taskq_cache, tq); } -SYSINIT(sol_taskq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, taskq_init, NULL) +SYSINIT(sol_taskq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, taskq_init, NULL); SYSUNINIT(sol_taskq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, taskq_fini, NULL); diff --git a/sys/contrib/opensolaris/uts/common/os/callb.c b/sys/contrib/opensolaris/uts/common/os/callb.c index 9bfae13..c6e357e 100644 --- a/sys/contrib/opensolaris/uts/common/os/callb.c +++ b/sys/contrib/opensolaris/uts/common/os/callb.c @@ -359,5 +359,5 @@ callb_unlock_table(void) mutex_exit(&ct->ct_lock); } -SYSINIT(sol_callb, SI_SUB_DRIVERS, SI_ORDER_FIRST, callb_init, NULL) +SYSINIT(sol_callb, SI_SUB_DRIVERS, SI_ORDER_FIRST, callb_init, NULL); SYSUNINIT(sol_callb, SI_SUB_DRIVERS, SI_ORDER_FIRST, callb_fini, NULL); diff --git a/sys/contrib/opensolaris/uts/common/os/taskq.c b/sys/contrib/opensolaris/uts/common/os/taskq.c index 220f080..1558c1f 100644 --- a/sys/contrib/opensolaris/uts/common/os/taskq.c +++ b/sys/contrib/opensolaris/uts/common/os/taskq.c @@ -1016,5 +1016,5 @@ taskq_destroy(taskq_t *tq) kmem_cache_free(taskq_cache, tq); } -SYSINIT(sol_taskq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, taskq_init, NULL) +SYSINIT(sol_taskq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, taskq_init, NULL); SYSUNINIT(sol_taskq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, taskq_fini, NULL); diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c index 7d6f5eb..154bcc5 100644 --- a/sys/dev/ofw/ofw_console.c +++ b/sys/dev/ofw/ofw_console.c @@ -105,7 +105,7 @@ cn_drvinit(void *unused) } } -SYSINIT(cndev, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE, cn_drvinit, NULL) +SYSINIT(cndev, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE, cn_drvinit, NULL); static int stdin; static int stdout; diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c index fa89a23..35d761b 100644 --- a/sys/dev/syscons/sysmouse.c +++ b/sys/dev/syscons/sysmouse.c @@ -245,7 +245,7 @@ sm_attach_mouse(void *unused) /* sysmouse doesn't have scr_stat */ } -SYSINIT(sysmouse, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sm_attach_mouse, NULL) +SYSINIT(sysmouse, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sm_attach_mouse, NULL); int sysmouse_event(mouse_info_t *info) diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c index cc5803d..386ddb1 100644 --- a/sys/i386/acpica/acpi_wakeup.c +++ b/sys/i386/acpica/acpi_wakeup.c @@ -322,7 +322,7 @@ acpi_alloc_wakeup_handler(void) acpi_wakeaddr = (vm_offset_t)wakeaddr; } -SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0) +SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0); static void acpi_realmodeinst(void *arg, bus_dma_segment_t *segs, int nsegs, int error) diff --git a/sys/i386/acpica/madt.c b/sys/i386/acpica/madt.c index f00a3db..3e53cf0 100644 --- a/sys/i386/acpica/madt.c +++ b/sys/i386/acpica/madt.c @@ -408,7 +408,7 @@ madt_register(void *dummy __unused) apic_register_enumerator(&madt_enumerator); } -SYSINIT(madt_register, SI_SUB_CPU - 1, SI_ORDER_SECOND, madt_register, NULL) +SYSINIT(madt_register, SI_SUB_CPU - 1, SI_ORDER_SECOND, madt_register, NULL); /* * Call the handler routine for each entry in the MADT table. @@ -778,4 +778,4 @@ madt_set_ids(void *dummy) la->la_acpi_id); } } -SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL) +SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL); diff --git a/sys/i386/i386/intr_machdep.c b/sys/i386/i386/intr_machdep.c index 057ceaf..035faf4 100644 --- a/sys/i386/i386/intr_machdep.c +++ b/sys/i386/i386/intr_machdep.c @@ -508,7 +508,7 @@ intr_init(void *dummy __unused) sx_init(&intr_table_lock, "intr sources"); mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN); } -SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) +SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL); #ifdef DDB /* @@ -618,5 +618,6 @@ intr_shuffle_irqs(void *arg __unused) } sx_xunlock(&intr_table_lock); } -SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) +SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, + NULL); #endif diff --git a/sys/i386/i386/local_apic.c b/sys/i386/i386/local_apic.c index 46f985e..f35be2f 100644 --- a/sys/i386/i386/local_apic.c +++ b/sys/i386/i386/local_apic.c @@ -1065,7 +1065,7 @@ apic_init(void *dummy __unused) printf("%s: Failed to setup the local APIC: returned %d\n", best_enum->apic_name, retval); } -SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_SECOND, apic_init, NULL) +SYSINIT(apic_init, SI_SUB_CPU, SI_ORDER_SECOND, apic_init, NULL); /* * Setup the I/O APICs. @@ -1094,7 +1094,7 @@ apic_setup_io(void *dummy __unused) /* Enable the MSI "pic". */ msi_init(); } -SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL) +SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL); #ifdef SMP /* diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 4dbf7f0..54b5e9d 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -168,7 +168,7 @@ static int set_fpcontext(struct thread *td, const mcontext_t *mcp); static void set_fpregs_xmm(struct save87 *, struct savexmm *); static void fill_fpregs_xmm(struct savexmm *, struct save87 *); #endif /* CPU_ENABLE_SSE */ -SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) +SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); #ifdef DDB extern vm_offset_t ksym_start, ksym_end; @@ -2433,7 +2433,7 @@ spinlock_exit(void) #if defined(I586_CPU) && !defined(NO_F00F_HACK) static void f00f_hack(void *unused); -SYSINIT(f00f_hack, SI_SUB_INTRINSIC, SI_ORDER_FIRST, f00f_hack, NULL) +SYSINIT(f00f_hack, SI_SUB_INTRINSIC, SI_ORDER_FIRST, f00f_hack, NULL); static void f00f_hack(void *unused) diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 468e772..b472f05 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -1499,5 +1499,5 @@ mp_ipi_intrcnt(void *dummy) intrcnt_add(buf, &ipi_lazypmap_counts[i]); } } -SYSINIT(mp_ipi_intrcnt, SI_SUB_INTR, SI_ORDER_MIDDLE, mp_ipi_intrcnt, NULL) +SYSINIT(mp_ipi_intrcnt, SI_SUB_INTR, SI_ORDER_MIDDLE, mp_ipi_intrcnt, NULL); #endif diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index 2aae8ce..dccb64b 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -386,7 +386,7 @@ mptable_register(void *dummy __unused) apic_register_enumerator(&mptable_enumerator); } SYSINIT(mptable_register, SI_SUB_CPU - 1, SI_ORDER_FIRST, mptable_register, - NULL) + NULL); /* * Call the handler routine for each entry in the MP config table. diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index f041b54..c5d381c 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -109,7 +109,7 @@ static u_int cpu_reset_proxyid; static volatile u_int cpu_reset_proxy_active; #endif static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) +SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL); LIST_HEAD(sf_head, sf_buf); diff --git a/sys/i386/isa/atpic.c b/sys/i386/isa/atpic.c index bb05837..9fcfe2f 100644 --- a/sys/i386/isa/atpic.c +++ b/sys/i386/isa/atpic.c @@ -563,7 +563,7 @@ atpic_init(void *dummy __unused) intr_register_source(&ai->at_intsrc); } } -SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL) +SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL); void atpic_handle_intr(u_int vector, struct trapframe *frame) diff --git a/sys/i386/xbox/xbox.c b/sys/i386/xbox/xbox.c index af54682..623cf69 100644 --- a/sys/i386/xbox/xbox.c +++ b/sys/i386/xbox/xbox.c @@ -82,4 +82,4 @@ xbox_init(void) * This must be called before the drivers, as the if_nve(4) driver will fail * if we do not do this in advance. */ -SYSINIT(xbox, SI_SUB_DRIVERS, SI_ORDER_FIRST, xbox_init, NULL) +SYSINIT(xbox, SI_SUB_DRIVERS, SI_ORDER_FIRST, xbox_init, NULL); diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index a5ac5ce..98f2812 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -140,7 +140,7 @@ extern vm_offset_t ksym_start, ksym_end; #endif static void cpu_startup(void *); -SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) +SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); struct msgbuf *msgbufp=0; diff --git a/sys/ia64/ia64/sscdisk.c b/sys/ia64/ia64/sscdisk.c index 72597d7..f5db9d5 100644 --- a/sys/ia64/ia64/sscdisk.c +++ b/sys/ia64/ia64/sscdisk.c @@ -196,7 +196,7 @@ ssc_drvinit(void *unused) ssccreate(-1); } -SYSINIT(sscdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE, ssc_drvinit,NULL) +SYSINIT(sscdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE, ssc_drvinit,NULL); static void ssc_takeroot(void *junk) 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) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 66ee80a..4996175 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1826,7 +1826,7 @@ bpf_stats_sysctl(SYSCTL_HANDLER_ARGS) return (error); } -SYSINIT(bpfdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,bpf_drvinit,NULL) +SYSINIT(bpfdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,bpf_drvinit,NULL); #else /* !DEV_BPF && !NETGRAPH_BPF */ /* diff --git a/sys/net/if.c b/sys/net/if.c index d30f93c5..cf1cca0 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -155,8 +155,8 @@ static struct filterops netdev_filtops = /* * System initialization */ -SYSINIT(interfaces, SI_SUB_INIT_IF, SI_ORDER_FIRST, if_init, NULL) -SYSINIT(interface_check, SI_SUB_PROTO_IF, SI_ORDER_FIRST, if_check, NULL) +SYSINIT(interfaces, SI_SUB_INIT_IF, SI_ORDER_FIRST, if_init, NULL); +SYSINIT(interface_check, SI_SUB_PROTO_IF, SI_ORDER_FIRST, if_check, NULL); MALLOC_DEFINE(M_IFNET, "ifnet", "interface internals"); MALLOC_DEFINE(M_IFADDR, "ifaddr", "interface address"); diff --git a/sys/net/netisr.c b/sys/net/netisr.c index cb61ebe..9307b53 100644 --- a/sys/net/netisr.c +++ b/sys/net/netisr.c @@ -266,4 +266,4 @@ start_netisr(void *dummy) if (swi_add(NULL, "net", swi_net, NULL, SWI_NET, INTR_MPSAFE, &net_ih)) panic("start_netisr"); } -SYSINIT(start_netisr, SI_SUB_SOFTINTR, SI_ORDER_FIRST, start_netisr, NULL) +SYSINIT(start_netisr, SI_SUB_SOFTINTR, SI_ORDER_FIRST, start_netisr, NULL); diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index c2a2051..2893f4b 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -117,7 +117,7 @@ rts_init(void) mtx_init(&rtsintrq.ifq_mtx, "rts_inq", NULL, MTX_DEF); netisr_register(NETISR_ROUTE, rts_input, &rtsintrq, NETISR_MPSAFE); } -SYSINIT(rtsock, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, rts_init, 0) +SYSINIT(rtsock, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, rts_init, 0); static void rts_input(struct mbuf *m) diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c index 4376b66..d51b564 100644 --- a/sys/netatm/ipatm/ipatm_load.c +++ b/sys/netatm/ipatm/ipatm_load.c @@ -780,7 +780,7 @@ ipatm_mod(lkmtp, cmd, ver) */ static void ipatm_doload(void *); -SYSINIT(atmipatm, SI_SUB_PROTO_END, SI_ORDER_ANY, ipatm_doload, NULL) +SYSINIT(atmipatm, SI_SUB_PROTO_END, SI_ORDER_ANY, ipatm_doload, NULL); /* * Kernel initialization diff --git a/sys/netatm/sigpvc/sigpvc_if.c b/sys/netatm/sigpvc/sigpvc_if.c index 440de20..5d237cb 100644 --- a/sys/netatm/sigpvc/sigpvc_if.c +++ b/sys/netatm/sigpvc/sigpvc_if.c @@ -855,7 +855,7 @@ sigpvc_mod(lkmtp, cmd, ver) */ static void sigpvc_doload(void *); -SYSINIT(atmsigpvc, SI_SUB_PROTO_END, SI_ORDER_ANY, sigpvc_doload, NULL) +SYSINIT(atmsigpvc, SI_SUB_PROTO_END, SI_ORDER_ANY, sigpvc_doload, NULL); /* * Kernel initialization diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c index b07c503..6587812 100644 --- a/sys/netatm/spans/spans_if.c +++ b/sys/netatm/spans/spans_if.c @@ -1239,7 +1239,7 @@ spans_mod(lkmtp, cmd, ver) */ static void spans_doload(void *); -SYSINIT(atmspans, SI_SUB_PROTO_END, SI_ORDER_ANY, spans_doload, NULL) +SYSINIT(atmspans, SI_SUB_PROTO_END, SI_ORDER_ANY, spans_doload, NULL); /* * Kernel initialization diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c index feb1d7d..994c073 100644 --- a/sys/netatm/uni/uni_load.c +++ b/sys/netatm/uni/uni_load.c @@ -344,7 +344,7 @@ uni_mod(lkmtp, cmd, ver) */ static void uni_doload(void *); -SYSINIT(atmuni, SI_SUB_PROTO_END, SI_ORDER_ANY, uni_doload, NULL) +SYSINIT(atmuni, SI_SUB_PROTO_END, SI_ORDER_ANY, uni_doload, NULL); /* * Kernel initialization diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c index a99759b..8db26e8 100644 --- a/sys/netipsec/ipsec.c +++ b/sys/netipsec/ipsec.c @@ -1940,7 +1940,7 @@ ipsec_attach(void) SECPOLICY_LOCK_INIT(&ip4_def_policy); ip4_def_policy.refcnt = 1; /* NB: disallow free */ } -SYSINIT(ipsec, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, ipsec_attach, NULL) +SYSINIT(ipsec, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, ipsec_attach, NULL); /* XXX this stuff doesn't belong here... */ diff --git a/sys/nfsclient/nfs_diskless.c b/sys/nfsclient/nfs_diskless.c index a970b1d..58e99ee 100644 --- a/sys/nfsclient/nfs_diskless.c +++ b/sys/nfsclient/nfs_diskless.c @@ -332,6 +332,6 @@ nfs_rootconf(void) rootdevnames[0] = "nfs:"; } -SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, nfs_rootconf, NULL) +SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, nfs_rootconf, NULL); #endif diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 3599647..dd524c9 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -158,7 +158,7 @@ static int set_fpcontext(struct thread *td, const mcontext_t *mcp); static void set_fpregs_xmm(struct save87 *, struct savexmm *); static void fill_fpregs_xmm(struct savexmm *, struct save87 *); #endif /* CPU_ENABLE_SSE */ -SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) +SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); int need_pre_dma_flush; /* If 1, use wbinvd befor DMA transfer. */ int need_post_dma_flush; /* If 1, use invd after DMA transfer. */ @@ -2186,7 +2186,7 @@ spinlock_exit(void) #if defined(I586_CPU) && !defined(NO_F00F_HACK) static void f00f_hack(void *unused); -SYSINIT(f00f_hack, SI_SUB_INTRINSIC, SI_ORDER_FIRST, f00f_hack, NULL) +SYSINIT(f00f_hack, SI_SUB_INTRINSIC, SI_ORDER_FIRST, f00f_hack, NULL); static void f00f_hack(void *unused) diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index 4a70556..ceeadee 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -143,7 +143,7 @@ SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size, CTLFLAG_RD, &cacheline_size, 0, ""); static void cpu_startup(void *); -SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) +SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); void powerpc_init(u_int, u_int, u_int, void *); diff --git a/sys/powerpc/booke/machdep.c b/sys/powerpc/booke/machdep.c index 98d1b77..75e5cb6 100644 --- a/sys/powerpc/booke/machdep.c +++ b/sys/powerpc/booke/machdep.c @@ -180,7 +180,7 @@ SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size, CTLFLAG_RD, &cacheline_size, 0, ""); static void cpu_e500_startup(void *); -SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_e500_startup, NULL) +SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_e500_startup, NULL); void print_kernel_section_addr(void); void dump_bootinfo(void); diff --git a/sys/powerpc/booke/vm_machdep.c b/sys/powerpc/booke/vm_machdep.c index eb85a6e..8c3ad65 100644 --- a/sys/powerpc/booke/vm_machdep.c +++ b/sys/powerpc/booke/vm_machdep.c @@ -138,7 +138,7 @@ __FBSDID("$FreeBSD$"); #endif static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) +SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL); LIST_HEAD(sf_head, sf_buf); diff --git a/sys/security/audit/audit.c b/sys/security/audit/audit.c index b60d4f7..0cdd95c 100644 --- a/sys/security/audit/audit.c +++ b/sys/security/audit/audit.c @@ -262,7 +262,7 @@ audit_init(void) audit_worker_init(); } -SYSINIT(audit_init, SI_SUB_AUDIT, SI_ORDER_FIRST, audit_init, NULL) +SYSINIT(audit_init, SI_SUB_AUDIT, SI_ORDER_FIRST, audit_init, NULL); /* * Drain the audit queue and close the log at shutdown. Note that this can diff --git a/sys/sparc64/sparc64/vm_machdep.c b/sys/sparc64/sparc64/vm_machdep.c index 2f4c0ea..c163fd8 100644 --- a/sys/sparc64/sparc64/vm_machdep.c +++ b/sys/sparc64/sparc64/vm_machdep.c @@ -91,7 +91,7 @@ #endif static void sf_buf_init(void *arg); -SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) +SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL); /* * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h index 2cd6056..716332f 100644 --- a/sys/sys/eventhandler.h +++ b/sys/sys/eventhandler.h @@ -112,7 +112,7 @@ struct __hack priority); \ } \ SYSINIT(name ## _evh_init, SI_SUB_CONFIGURE, SI_ORDER_ANY, \ - name ## _evh_init, arg) \ + name ## _evh_init, arg); \ struct __hack #define EVENTHANDLER_INVOKE(name, ...) \ diff --git a/sys/sys/module.h b/sys/sys/module.h index bcffb45..6fbf524 100644 --- a/sys/sys/module.h +++ b/sys/sys/module.h @@ -129,7 +129,7 @@ struct mod_metadata { MODULE_DEPEND(name, kernel, __FreeBSD_version, \ __FreeBSD_version, MODULE_KERNEL_MAXVER); \ 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 6d6d9ad..c980fc1 100644 --- a/sys/sys/taskqueue.h +++ b/sys/sys/taskqueue.h @@ -97,7 +97,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 #define TASKQUEUE_DEFINE_THREAD(name) \ @@ -122,7 +122,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 #define TASKQUEUE_FAST_DEFINE_THREAD(name) \ diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index d598c32..41a6df8 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -711,7 +711,8 @@ static struct kproc_desc softdep_kp = { softdep_flush, &softdepproc }; -SYSINIT(sdproc, SI_SUB_KTHREAD_UPDATE, SI_ORDER_ANY, kproc_start, &softdep_kp) +SYSINIT(sdproc, SI_SUB_KTHREAD_UPDATE, SI_ORDER_ANY, kproc_start, + &softdep_kp); static void softdep_flush(void) diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 71b3b79..a1157ed 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -101,7 +101,7 @@ extern int maxslp; * Note: proc0 from proc.h */ static void vm_init_limits(void *); -SYSINIT(vm_limits, SI_SUB_VM_CONF, SI_ORDER_FIRST, vm_init_limits, &proc0) +SYSINIT(vm_limits, SI_SUB_VM_CONF, SI_ORDER_FIRST, vm_init_limits, &proc0); /* * THIS MUST BE THE LAST INITIALIZATION ITEM!!! @@ -109,7 +109,7 @@ SYSINIT(vm_limits, SI_SUB_VM_CONF, SI_ORDER_FIRST, vm_init_limits, &proc0) * Note: run scheduling should be divorced from the vm system. */ static void scheduler(void *); -SYSINIT(scheduler, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY, scheduler, NULL) +SYSINIT(scheduler, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY, scheduler, NULL); #ifndef NO_SWAPPING static int swapout(struct proc *); diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 9125366..0640602 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -97,7 +97,7 @@ SYSCTL_INT(_vm, OID_AUTO, exec_map_entries, CTLFLAG_RD, &exec_map_entries, 0, * System initialization */ static void vm_mem_init(void *); -SYSINIT(vm_mem, SI_SUB_VM, SI_ORDER_FIRST, vm_mem_init, NULL) +SYSINIT(vm_mem, SI_SUB_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 e6c82dc..8a496a6 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -104,7 +104,8 @@ SYSCTL_INT(_vm, OID_AUTO, max_proc_mmap, CTLFLAG_RW, &max_proc_mmap, 0, ""); * multi-threaded processes are not unduly inconvenienced. */ static void vmmapentry_rsrc_init(void *); -SYSINIT(vmmersrc, SI_SUB_KVM_RSRC, SI_ORDER_FIRST, vmmapentry_rsrc_init, NULL) +SYSINIT(vmmersrc, SI_SUB_KVM_RSRC, SI_ORDER_FIRST, vmmapentry_rsrc_init, + NULL); static void vmmapentry_rsrc_init(dummy) diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index f5d4ee7..bf899a6 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -123,7 +123,8 @@ static struct kproc_desc page_kp = { vm_pageout, &pageproc }; -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); #if !defined(NO_SWAPPING) /* the kernel process "vm_daemon"*/ @@ -135,7 +136,7 @@ static struct kproc_desc vm_kp = { vm_daemon, &vmproc }; -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 diff --git a/sys/vm/vm_zeroidle.c b/sys/vm/vm_zeroidle.c index c994695..c82de5a 100644 --- a/sys/vm/vm_zeroidle.c +++ b/sys/vm/vm_zeroidle.c @@ -164,4 +164,4 @@ pagezero_start(void __unused *arg) sched_add(td, SRQ_BORING); thread_unlock(td); } -SYSINIT(pagezero, SI_SUB_KTHREAD_VM, SI_ORDER_ANY, pagezero_start, NULL) +SYSINIT(pagezero, SI_SUB_KTHREAD_VM, SI_ORDER_ANY, pagezero_start, NULL); |
