Merge lib into kern

There are no precise enough criteria to justify the separation of these
two directories.

5 files changed, 19 insertions, 19 deletions

diff --git a/vm/vm_kmem.c b/vm/vm_kmem.c
index 72d02899..a90fb058 100644
--- a/vm/vm_kmem.c
+++ b/vm/vm_kmem.c
@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <kern/assert.h>
 #include <kern/init.h>
 #include <kern/panic.h>
 #include <kern/param.h>
+#include <kern/stddef.h>
 #include <kern/types.h>
-#include <lib/assert.h>
-#include <lib/stddef.h>
 #include <machine/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_kmem.h>
diff --git a/vm/vm_map.c b/vm/vm_map.c
index 6eecab73..8343472f 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -19,18 +19,18 @@
  * needed for kernel allocation.
  */
 
+#include <kern/assert.h>
 #include <kern/error.h>
 #include <kern/init.h>
 #include <kern/kmem.h>
+#include <kern/list.h>
+#include <kern/macros.h>
 #include <kern/panic.h>
 #include <kern/param.h>
 #include <kern/printk.h>
-#include <lib/assert.h>
-#include <lib/list.h>
-#include <lib/macros.h>
-#include <lib/rbtree.h>
-#include <lib/stddef.h>
-#include <lib/stdint.h>
+#include <kern/rbtree.h>
+#include <kern/stddef.h>
+#include <kern/stdint.h>
 #include <machine/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_kmem.h>
diff --git a/vm/vm_map.h b/vm/vm_map.h
index 7231b6a3..9759ff4b 100644
--- a/vm/vm_map.h
+++ b/vm/vm_map.h
@@ -21,9 +21,9 @@
 #ifndef _VM_VM_MAP_H
 #define _VM_VM_MAP_H
 
-#include <lib/list.h>
-#include <lib/rbtree.h>
-#include <lib/stdint.h>
+#include <kern/list.h>
+#include <kern/rbtree.h>
+#include <kern/stdint.h>
 #include <machine/pmap.h>
 
 /*
diff --git a/vm/vm_page.h b/vm/vm_page.h
index e499dc52..e5ad8fc5 100644
--- a/vm/vm_page.h
+++ b/vm/vm_page.h
@@ -18,8 +18,8 @@
 #ifndef _VM_VM_PAGE_H
 #define _VM_VM_PAGE_H
 
-#include <lib/list.h>
-#include <lib/macros.h>
+#include <kern/list.h>
+#include <kern/macros.h>
 #include <kern/param.h>
 #include <kern/types.h>
 
diff --git a/vm/vm_phys.c b/vm/vm_phys.c
index 81e655bf..9fcc7cc9 100644
--- a/vm/vm_phys.c
+++ b/vm/vm_phys.c
@@ -29,17 +29,17 @@
  * The symmetric case is handled likewise.
  */
 
+#include <kern/assert.h>
 #include <kern/init.h>
+#include <kern/list.h>
+#include <kern/macros.h>
 #include <kern/panic.h>
 #include <kern/param.h>
 #include <kern/printk.h>
+#include <kern/sprintf.h>
+#include <kern/stddef.h>
+#include <kern/string.h>
 #include <kern/types.h>
-#include <lib/assert.h>
-#include <lib/list.h>
-#include <lib/macros.h>
-#include <lib/sprintf.h>
-#include <lib/stddef.h>
-#include <lib/string.h>
 #include <machine/cpu.h>
 #include <vm/vm_kmem.h>
 #include <vm/vm_page.h>