xnu-3789.1.32.tar.gz

[apple/xnu.git] / bsd / kern / kern_newsysctl.c

diff --git a/bsd/kern/kern_newsysctl.c b/bsd/kern/kern_newsysctl.c
index fdd86a9484075352b894bf5f6287deeaf009e67a..6895674f979c0e291693f65d88e0ed50f0b6c845 100644 (file)
--- a/bsd/kern/kern_newsysctl.c
+++ b/bsd/kern/kern_newsysctl.c
@@ -78,6 +78,7 @@
 #include <sys/sysproto.h>
 
 #include <security/audit/audit.h>
+#include <pexpert/pexpert.h>
 
 lck_grp_t * sysctl_lock_group = NULL;
 lck_rw_t * sysctl_geometry_lock = NULL;
@@ -177,19 +178,6 @@ sysctl_register_oid(struct sysctl_oid *new_oidp)
                }
        }
 
-       if(sysctl_geometry_lock == NULL)
-       {
-               /*
-                * Initialise the geometry lock for reading/modifying the
-                * sysctl tree. This is done here because IOKit registers
-                * some sysctl's before bsd_init() calls
-                * sysctl_register_fixed().
-                */
-
-               sysctl_lock_group  = lck_grp_alloc_init("sysctl", NULL);
-               sysctl_geometry_lock = lck_rw_alloc_init(sysctl_lock_group, NULL);
-               sysctl_unlocked_node_lock = lck_mtx_alloc_init(sysctl_lock_group, NULL);
-       }
        /* Get the write lock to modify the geometry */
        lck_rw_lock_exclusive(sysctl_geometry_lock);
 
@@ -321,21 +309,35 @@ sysctl_unregister_set(const char *set)
        }
 }
 
-
 /*
- * Register the kernel's oids on startup.
+ * Exported in BSDKernel.exports, kept for binary compatibility
  */
-
+#if defined(__x86_64__)
 void
-sysctl_register_all()
+sysctl_register_fixed(void)
 {
-       sysctl_register_set("__sysctl_set");
 }
+#endif
+
+/*
+ * Register the kernel's oids on startup.
+ */
 
 void
-sysctl_register_fixed(void)
+sysctl_early_init(void)
 {
-       sysctl_register_all();
+       /*
+        * Initialize the geometry lock for reading/modifying the
+        * sysctl tree. This is done here because IOKit registers
+        * some sysctl's before bsd_init() would otherwise perform
+        * subsystem initialization.
+        */
+
+       sysctl_lock_group  = lck_grp_alloc_init("sysctl", NULL);
+       sysctl_geometry_lock = lck_rw_alloc_init(sysctl_lock_group, NULL);
+       sysctl_unlocked_node_lock = lck_mtx_alloc_init(sysctl_lock_group, NULL);
+
+       sysctl_register_set("__sysctl_set");
 }
 
 /*