X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..ca66cea69e6e866fd781ae2260d9474bdd48f2ca:/bsd/kern/bsd_init.c?ds=sidebyside

diff --git a/bsd/kern/bsd_init.c b/bsd/kern/bsd_init.c
index 2ea3d6377..50d955a3f 100644
--- a/bsd/kern/bsd_init.c
+++ b/bsd/kern/bsd_init.c
@@ -223,7 +223,7 @@ struct	vnode *rootvp;
 int boothowto = RB_DEBUG;
 
 void lightning_bolt(void *);
-extern kern_return_t IOFindBSDRoot(char *, dev_t *, u_int32_t *);
+extern kern_return_t IOFindBSDRoot(char *, unsigned int, dev_t *, u_int32_t *);
 extern void IOSecureBSDRoot(const char * rootName);
 extern kern_return_t IOKitBSDInit(void );
 extern void kminit(void);
@@ -569,6 +569,7 @@ bsd_init(void)
 	/*
 	 * Initialize the calendar.
 	 */
+	bsd_init_kprintf("calling IOKitInitializeTime\n");
 	IOKitInitializeTime();
 
 	if (turn_on_log_leaks && !new_nkdbufs)
@@ -961,7 +962,7 @@ setconf(void)
 	 * which needs to be under network funnel. Right thing to do
 	 * here is to drop the funnel alltogether and regrab it afterwards
 	 */
-	err = IOFindBSDRoot( rootdevice, &rootdev, &flags );
+	err = IOFindBSDRoot(rootdevice, sizeof(rootdevice), &rootdev, &flags);
 	if( err) {
 		printf("setconf: IOFindBSDRoot returned an error (%d);"
 			"setting rootdevice to 'sd0a'.\n", err); /* XXX DEBUG TEMP */
@@ -1031,7 +1032,9 @@ parse_bsd_args(void)
 	if (PE_parse_boot_arg("nbuf", &max_nbuf_headers)) {
 		customnbuf = 1;
 	}
+#if !defined(SECURE_KERNEL)
 	PE_parse_boot_arg("kmem", &setup_kmem);
+#endif
 	PE_parse_boot_arg("trace", &new_nkdbufs);
 
 	if (PE_parse_boot_arg("msgbuf", &msgbuf)) {