svn commit: r359652 - in stable/11/sys: dev/acpica fs/cuse i386/bios kern net

Hans Petter Selasky hselasky at FreeBSD.org
Mon Apr 6 07:16:35 UTC 2020


Author: hselasky
Date: Mon Apr  6 07:16:31 2020
New Revision: 359652
URL: https://svnweb.freebsd.org/changeset/base/359652

Log:
  MFC r333806:
  Use NULL for SYSINIT's last arg, which is a pointer type
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/sys/dev/acpica/acpi.c
  stable/11/sys/fs/cuse/cuse.c
  stable/11/sys/i386/bios/apm.c
  stable/11/sys/kern/imgact_binmisc.c
  stable/11/sys/kern/kern_linker.c
  stable/11/sys/kern/kern_module.c
  stable/11/sys/kern/kern_synch.c
  stable/11/sys/kern/kern_sysctl.c
  stable/11/sys/kern/link_elf.c
  stable/11/sys/kern/link_elf_obj.c
  stable/11/sys/kern/posix4_mib.c
  stable/11/sys/kern/subr_pcpu.c
  stable/11/sys/net/route.c
  stable/11/sys/net/vnet.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/acpica/acpi.c
==============================================================================
--- stable/11/sys/dev/acpica/acpi.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/dev/acpica/acpi.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -4158,4 +4158,4 @@ acpi_pm_register(void *arg)
     power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, NULL);
 }
 
-SYSINIT(power, SI_SUB_KLD, SI_ORDER_ANY, acpi_pm_register, 0);
+SYSINIT(power, SI_SUB_KLD, SI_ORDER_ANY, acpi_pm_register, NULL);

Modified: stable/11/sys/fs/cuse/cuse.c
==============================================================================
--- stable/11/sys/fs/cuse/cuse.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/fs/cuse/cuse.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -268,7 +268,7 @@ cuse_kern_init(void *arg)
 	    (CUSE_VERSION >> 16) & 0xFF, (CUSE_VERSION >> 8) & 0xFF,
 	    (CUSE_VERSION >> 0) & 0xFF);
 }
-SYSINIT(cuse_kern_init, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_init, 0);
+SYSINIT(cuse_kern_init, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_init, NULL);
 
 static void
 cuse_kern_uninit(void *arg)

Modified: stable/11/sys/i386/bios/apm.c
==============================================================================
--- stable/11/sys/i386/bios/apm.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/i386/bios/apm.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -1589,4 +1589,4 @@ apm_pm_register(void *arg)
 		power_pm_register(POWER_PM_TYPE_APM, apm_pm_func, NULL);
 }
 
-SYSINIT(power, SI_SUB_KLD, SI_ORDER_ANY, apm_pm_register, 0);
+SYSINIT(power, SI_SUB_KLD, SI_ORDER_ANY, apm_pm_register, NULL);

Modified: stable/11/sys/kern/imgact_binmisc.c
==============================================================================
--- stable/11/sys/kern/imgact_binmisc.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/kern/imgact_binmisc.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -747,8 +747,10 @@ imgact_binmisc_fini(void *arg)
 	sx_destroy(&interp_list_sx);
 }
 
-SYSINIT(imgact_binmisc, SI_SUB_EXEC, SI_ORDER_MIDDLE, imgact_binmisc_init, 0);
-SYSUNINIT(imgact_binmisc, SI_SUB_EXEC, SI_ORDER_MIDDLE, imgact_binmisc_fini, 0);
+SYSINIT(imgact_binmisc, SI_SUB_EXEC, SI_ORDER_MIDDLE, imgact_binmisc_init,
+    NULL);
+SYSUNINIT(imgact_binmisc, SI_SUB_EXEC, SI_ORDER_MIDDLE, imgact_binmisc_fini,
+    NULL);
 
 /*
  * Tell kern_execve.c about it, with a little help from the linker.

Modified: stable/11/sys/kern/kern_linker.c
==============================================================================
--- stable/11/sys/kern/kern_linker.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/kern/kern_linker.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -161,7 +161,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, NULL);
 
 static void
 linker_stop_class_add(void *arg)
@@ -409,7 +409,7 @@ linker_init_kernel_modules(void)
 }
 
 SYSINIT(linker_kernel, SI_SUB_KLD, SI_ORDER_ANY, linker_init_kernel_modules,
-    0);
+    NULL);
 
 static int
 linker_load_file(const char *filename, linker_file_t *result)
@@ -1680,7 +1680,7 @@ fail:
 	/* 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, NULL);
 
 /*
  * Search for a not-loaded module by name.

Modified: stable/11/sys/kern/kern_module.c
==============================================================================
--- stable/11/sys/kern/kern_module.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/kern/kern_module.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -89,7 +89,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, NULL);
 
 static void
 module_shutdown(void *arg1, int arg2)

Modified: stable/11/sys/kern/kern_synch.c
==============================================================================
--- stable/11/sys/kern/kern_synch.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/kern/kern_synch.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -107,7 +107,7 @@ sleepinit(void *unused)
  * vmem tries to lock the sleepq mutexes when free'ing kva, so make sure
  * it is available.
  */
-SYSINIT(sleepinit, SI_SUB_KMEM, SI_ORDER_ANY, sleepinit, 0);
+SYSINIT(sleepinit, SI_SUB_KMEM, SI_ORDER_ANY, sleepinit, NULL);
 
 /*
  * General sleep call.  Suspends the current thread until a wakeup is

Modified: stable/11/sys/kern/kern_sysctl.c
==============================================================================
--- stable/11/sys/kern/kern_sysctl.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/kern/kern_sysctl.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -829,7 +829,7 @@ sysctl_register_all(void *arg)
 		sysctl_register_oid(*oidp);
 	SYSCTL_WUNLOCK();
 }
-SYSINIT(sysctl, SI_SUB_KMEM, SI_ORDER_FIRST, sysctl_register_all, 0);
+SYSINIT(sysctl, SI_SUB_KMEM, SI_ORDER_FIRST, sysctl_register_all, NULL);
 
 /*
  * "Staff-functions"

Modified: stable/11/sys/kern/link_elf.c
==============================================================================
--- stable/11/sys/kern/link_elf.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/kern/link_elf.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -464,7 +464,7 @@ link_elf_init(void* arg)
 #endif
 }
 
-SYSINIT(link_elf, SI_SUB_KLD, SI_ORDER_THIRD, link_elf_init, 0);
+SYSINIT(link_elf, SI_SUB_KLD, SI_ORDER_THIRD, link_elf_init, NULL);
 
 static int
 link_elf_preload_parse_symbols(elf_file_t ef)

Modified: stable/11/sys/kern/link_elf_obj.c
==============================================================================
--- stable/11/sys/kern/link_elf_obj.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/kern/link_elf_obj.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -192,7 +192,7 @@ link_elf_init(void *arg)
 	linker_add_class(&link_elf_class);
 }
 
-SYSINIT(link_elf_obj, SI_SUB_KLD, SI_ORDER_SECOND, link_elf_init, 0);
+SYSINIT(link_elf_obj, SI_SUB_KLD, SI_ORDER_SECOND, link_elf_init, NULL);
 
 static int
 link_elf_link_preload(linker_class_t cls, const char *filename,

Modified: stable/11/sys/kern/posix4_mib.c
==============================================================================
--- stable/11/sys/kern/posix4_mib.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/kern/posix4_mib.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -171,5 +171,5 @@ p31b_set_standard(void *dummy)
 }
 
 SYSINIT(p31b_set_standard, SI_SUB_P1003_1B, SI_ORDER_ANY, p31b_set_standard, 
-	0);
+    NULL);
 

Modified: stable/11/sys/kern/subr_pcpu.c
==============================================================================
--- stable/11/sys/kern/subr_pcpu.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/kern/subr_pcpu.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -125,7 +125,7 @@ dpcpu_startup(void *dummy __unused)
 	TAILQ_INSERT_HEAD(&dpcpu_head, df, df_link);
 	sx_init(&dpcpu_lock, "dpcpu alloc lock");
 }
-SYSINIT(dpcpu, SI_SUB_KLD, SI_ORDER_FIRST, dpcpu_startup, 0);
+SYSINIT(dpcpu, SI_SUB_KLD, SI_ORDER_FIRST, dpcpu_startup, NULL);
 
 /*
  * UMA_PCPU_ZONE zones, that are available for all kernel

Modified: stable/11/sys/net/route.c
==============================================================================
--- stable/11/sys/net/route.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/net/route.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -227,7 +227,7 @@ route_init(void)
 	if (rt_numfibs == 0)
 		rt_numfibs = 1;
 }
-SYSINIT(route_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, route_init, 0);
+SYSINIT(route_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, route_init, NULL);
 
 static int
 rtentry_zinit(void *mem, int size, int how)

Modified: stable/11/sys/net/vnet.c
==============================================================================
--- stable/11/sys/net/vnet.c	Mon Apr  6 07:09:04 2020	(r359651)
+++ stable/11/sys/net/vnet.c	Mon Apr  6 07:16:31 2020	(r359652)
@@ -348,7 +348,7 @@ vnet_data_startup(void *dummy __unused)
 	TAILQ_INSERT_HEAD(&vnet_data_free_head, df, vnd_link);
 	sx_init(&vnet_data_free_lock, "vnet_data alloc lock");
 }
-SYSINIT(vnet_data, SI_SUB_KLD, SI_ORDER_FIRST, vnet_data_startup, 0);
+SYSINIT(vnet_data, SI_SUB_KLD, SI_ORDER_FIRST, vnet_data_startup, NULL);
 
 /* Dummy VNET_SYSINIT to make sure we always reach the final end state. */
 static void


More information about the svn-src-stable-11 mailing list