Switch to initialization operations

1 files changed, 2 insertions, 36 deletions

diff --git a/kern/kernel.c b/kern/kernel.c
index 6c562f4..434297d 100644
--- a/kern/kernel.c
+++ b/kern/kernel.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014 Richard Braun.
+ * Copyright (c) 2011-2017 Richard Braun.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,53 +15,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <kern/cpumap.h>
 #include <kern/init.h>
 #include <kern/kernel.h>
-#include <kern/llsync.h>
-#include <kern/log.h>
-#include <kern/percpu.h>
-#include <kern/shell.h>
-#include <kern/shutdown.h>
-#include <kern/sleepq.h>
-#include <kern/sref.h>
-#include <kern/syscnt.h>
-#include <kern/task.h>
 #include <kern/thread.h>
-#include <kern/turnstile.h>
-#include <kern/work.h>
-#include <kern/xcall.h>
 #include <machine/cpu.h>
 #include <vm/vm_page.h>
 
-#ifdef X15_RUN_TEST_MODULE
-#include <test/test.h>
-#endif /* X15_RUN_TEST_MODULE */
-
 void __init
 kernel_main(void)
 {
     assert(!cpu_intr_enabled());
 
-    percpu_cleanup();
-    shell_setup();
-    syscnt_register_shell_cmds();
-    cpumap_setup();
-    xcall_setup();
-    task_setup();
-    sleepq_setup();
-    turnstile_setup();
-    thread_setup();
-    work_setup();
-    llsync_setup();
-    sref_setup();
+    init_setup();
     vm_page_log_info();
-    shutdown_register_shell_cmds();
-    log_start();
-
-#ifdef X15_RUN_TEST_MODULE
-    test_setup();
-#endif /* X15_RUN_TEST_MODULE */
 
     /*
      * Enabling application processors is done late in the boot process for