From 56bfeaaadbb869ae8cf07f0a7ec3a48f6b925fd0 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 12 Mar 2015 18:06:13 +0100 Subject: [PATCH] kernel: Followup commit to f3f3eadbf9de7a55ef1ff8cb23a68641403906ea. Fix some more SYSINIT() cases (all in code which isn't compiled for one reason or the other), mainly to make a branch merge better here. --- sys/dev/disk/iscsi/initiator/iscsi.c | 2 +- sys/dev/serial/stl/stallion.c | 2 +- sys/kern/subr_prof.c | 2 +- sys/kern/uipc_domain.c | 2 +- sys/netproto/ipsec/xform_esp.c | 3 +-- sys/netproto/ipsec/xform_ipcomp.c | 2 +- sys/platform/pc32/acpica/acpi_wakeup.c | 2 +- sys/platform/pc32/i386/perfmon.c | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/dev/disk/iscsi/initiator/iscsi.c b/sys/dev/disk/iscsi/initiator/iscsi.c index e499291260..367464b6f3 100644 --- a/sys/dev/disk/iscsi/initiator/iscsi.c +++ b/sys/dev/disk/iscsi/initiator/iscsi.c @@ -910,7 +910,7 @@ iscsi_rootconf(void) kprintf("** iscsi_rootconf **\n"); } -SYSINIT(cpu_rootconf1, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, iscsi_rootconf, NULL) +SYSINIT(cpu_rootconf1, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, iscsi_rootconf, NULL); #endif DECLARE_MODULE(iscsi_initiator, iscsi_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); diff --git a/sys/dev/serial/stl/stallion.c b/sys/dev/serial/stl/stallion.c index 51bac531fe..7d490a32fa 100644 --- a/sys/dev/serial/stl/stallion.c +++ b/sys/dev/serial/stl/stallion.c @@ -716,7 +716,7 @@ static void stl_drvinit(void *unused) { } -SYSINIT(sidev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,stl_drvinit,NULL) +SYSINIT(sidev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,stl_drvinit,NULL); /*****************************************************************************/ diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index 21c94931d6..2fb80224bc 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -51,7 +51,7 @@ 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 }; diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 4393e0f269..75867106e4 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -51,7 +51,7 @@ * want to call a registration function rather than being handled here * in domaininit(). Probably this will look like: * - * SYSINIT(unique, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, domain_add, xxx) + * SYSINIT(unique, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, domain_add, xxx); * * Where 'xxx' is replaced by the address of a parameter struct to be * passed to the doamin_add() function. diff --git a/sys/netproto/ipsec/xform_esp.c b/sys/netproto/ipsec/xform_esp.c index d5479450fe..66f5a8680e 100644 --- a/sys/netproto/ipsec/xform_esp.c +++ b/sys/netproto/ipsec/xform_esp.c @@ -1,5 +1,4 @@ /* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.2 2003/02/26 00:14:05 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/xform_esp.c,v 1.13 2008/01/06 16:55:52 swildner Exp $ */ /* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -969,4 +968,4 @@ esp_attach(void) xform_register(&esp_xformsw); #undef MAXIV } -SYSINIT(esp_xform_init, SI_SUB_DRIVERS, SI_ORDER_FIRST, esp_attach, NULL) +SYSINIT(esp_xform_init, SI_SUB_DRIVERS, SI_ORDER_FIRST, esp_attach, NULL); diff --git a/sys/netproto/ipsec/xform_ipcomp.c b/sys/netproto/ipsec/xform_ipcomp.c index b93747384e..97cb7e4440 100644 --- a/sys/netproto/ipsec/xform_ipcomp.c +++ b/sys/netproto/ipsec/xform_ipcomp.c @@ -615,4 +615,4 @@ ipcomp_attach(void) { xform_register(&ipcomp_xformsw); } -SYSINIT(ipcomp_xform_init, SI_SUB_DRIVERS, SI_ORDER_FIRST, ipcomp_attach, NULL) +SYSINIT(ipcomp_xform_init, SI_SUB_DRIVERS, SI_ORDER_FIRST, ipcomp_attach, NULL); diff --git a/sys/platform/pc32/acpica/acpi_wakeup.c b/sys/platform/pc32/acpica/acpi_wakeup.c index 9f6f6574ac..333ee65a03 100644 --- a/sys/platform/pc32/acpica/acpi_wakeup.c +++ b/sys/platform/pc32/acpica/acpi_wakeup.c @@ -327,7 +327,7 @@ acpi_alloc_wakeup_handler(void) } } -SYSINIT(acpiwakeup, SI_BOOT1_POST, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0) +SYSINIT(acpiwakeup, SI_BOOT1_POST, 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/platform/pc32/i386/perfmon.c b/sys/platform/pc32/i386/perfmon.c index 4faab0dbb5..a81bed29c9 100644 --- a/sys/platform/pc32/i386/perfmon.c +++ b/sys/platform/pc32/i386/perfmon.c @@ -71,7 +71,7 @@ perfmon_driver_init(void *unused __unused) make_dev(&perfmon_ops, 32, UID_ROOT, GID_KMEM, 0640, "perfmon"); } -SYSINIT(perfmondrv, SI_SUB_DRIVERS, SI_ORDER_ANY, perfmon_driver_init, NULL) +SYSINIT(perfmondrv, SI_SUB_DRIVERS, SI_ORDER_ANY, perfmon_driver_init, NULL); /* * This is called in early boot, after cpu_class has been set up. -- 2.41.0