xnu-1504.15.3.tar.gz

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

diff --git a/bsd/kern/bsd_init.c b/bsd/kern/bsd_init.c
index f36d6d4ceac344d0e8edbc5ff30440c8814a05fc..e2868a40c6d3bf3ee5ddc47ec800839182e3b2b2 100644 (file)
--- a/bsd/kern/bsd_init.c
+++ b/bsd/kern/bsd_init.c
@@ -172,10 +172,6 @@
 
 #include <pexpert/pexpert.h>
 
-#if CONFIG_EMBEDDED
-#include <libkern/OSKextLib.h>
-#endif
-
 void * get_user_regs(thread_t);                /* XXX kludge for <machine/thread.h> */
 void IOKitInitializeTime(void);                /* XXX */
 void IOSleep(unsigned int);            /* XXX */
@@ -670,12 +666,6 @@ bsd_init(void)
        bsd_init_kprintf("calling knote_init\n");
        knote_init();
 
-#if CONFIG_EMBEDDED
-       /* Initialize kernel memory status notifications */
-       bsd_init_kprintf("calling kern_memorystatus_init\n");
-       kern_memorystatus_init();
-#endif
-
        /* Initialize for async IO */
        bsd_init_kprintf("calling aio_init\n");
        aio_init();
@@ -739,6 +729,12 @@ bsd_init(void)
        kernproc->p_fd->fd_cdir = NULL;
        kernproc->p_fd->fd_rdir = NULL;
 
+#if CONFIG_EMBEDDED
+       /* Initialize kernel memory status notifications */
+       bsd_init_kprintf("calling kern_memorystatus_init\n");
+       kern_memorystatus_init();
+#endif
+
 #ifdef GPROF
        /* Initialize kernel profiling. */
        kmstartup();
@@ -970,16 +966,6 @@ bsd_init(void)
        consider_zone_gc(FALSE);
 #endif
 
-#if CONFIG_EMBEDDED
-       /*
-        * XXX workaround for:
-        * <rdar://problem/6378731> Kirkwood7A135: PPP KEXT no longer loads
-        */
-       OSKextLoadKextWithIdentifier("com.apple.nke.ppp");
-       OSKextLoadKextWithIdentifier("com.apple.nke.l2tp");
-       OSKextLoadKextWithIdentifier("com.apple.nke.pptp");
-#endif
-
        bsd_init_kprintf("done\n");
 }