Remove testing hacks from main.c

ab043853 · Silas Boyd-Wickizer · ab809e2d · ab043853
--- a/main.c
+++ b/main.c
@@ -32,14 +32,8 @@ mpboot(void)
  initseg();
  initlapic();
  inittls();
-  // XXX
-  // XXX
-  // XXX
-  scheduler();     // start running processes
-#if 0
  bstate = 1;
  scheduler();     // start running processes
-#endif
 }

 // Start the non-boot processors.
@@ -80,6 +74,8 @@ bootothers(void)
 void
 cmain(void)
 {
+  extern pml4e_t kpml4[];
+
  inituart();
  initcga();
  initconsole();
@@ -97,13 +93,12 @@ cmain(void)
  initinode();     // inode cache
  initdisk();      // disk

-  cprintf("booting others..\n");
+  cprintf("ncpu %d\n", ncpu);

  inituser();      // first user process
  bootothers();    // start other processors
+  kpml4[0] = 0;    // don't need 1 GB identity mapping anymore

-  // XXX(sbw) kill ident. mapping
-  
-  cprintf("ncpu %d\n", ncpu);
-  panic("end");
+  scheduler();
+  panic("Unreachable");
 }