various little fixes that should have been in earlier checkins

diff --git a/main.c b/main.c
index 7606adccfb2a2717ff64b77048be683eeace6182..39c11dce973f9927f1dee9631574fe29130c9bec 100644 (file)
--- a/main.c
+++ b/main.c
@@ -87,8 +87,6 @@ main0(void)
   cprintf("loaded userfs\n");
 
   scheduler();
-
-  return 0;
 }
 
 // Additional processors start here.

diff --git a/mp.c b/mp.c
index c6e7d3fb500b82189892f946c5835211d970ccfe..875bf3fc8e9f6bf229178c5926b7a579725c1c42 100644 (file)
--- a/mp.c
+++ b/mp.c
@@ -1,7 +1,6 @@
 #include "types.h"
 #include "mp.h"
 #include "defs.h"
-#include "memlayout.h"
 #include "param.h"
 #include "x86.h"
 #include "traps.h"