Merging in 2.0.2.

2017-01-09 22:37:50 -05:00
parent a0406ec181
commit 50cf3276e7
118 changed files with 1350 additions and 3158 deletions
--- a/kern/main/main.c
+++ b/kern/main/main.c
@@ -48,7 +48,6 @@
 #include <device.h>
 #include <syscall.h>
 #include <test.h>
-#include <kern/test161.h>
 #include <version.h>
 #include "autoconf.h"  // for pseudoconfig

@@ -128,7 +127,6 @@ boot(void)
 	vm_bootstrap();
 	kprintf_bootstrap();
 	thread_start_cpus();
-	test161_bootstrap();

 	/* Default bootfs - but ignore failure, in case emu0 doesn't exist */
 	vfs_setbootfs("emu0");