From d4b55422d35d65c648d6bb91798e0f57497dc56c Mon Sep 17 00:00:00 2001
From: Martin Decky <martin@decky.cz>
Date: Tue, 28 Nov 2006 11:06:20 +0000
Subject: [PATCH] move files to more proper locations

---
 kernel/Makefile                         | 2 +-
 kernel/generic/include/{ => lib}/elf.h  | 0
 kernel/generic/include/{mm => lib}/rd.h | 0
 kernel/generic/include/mm/as.h          | 2 +-
 kernel/generic/src/lib/elf.c            | 2 +-
 kernel/generic/src/{mm => lib}/rd.c     | 2 +-
 kernel/generic/src/main/kinit.c         | 2 +-
 kernel/generic/src/mm/backend_elf.c     | 2 +-
 kernel/generic/src/proc/task.c          | 2 +-
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename kernel/generic/include/{ => lib}/elf.h (100%)
 rename kernel/generic/include/{mm => lib}/rd.h (100%)
 rename kernel/generic/src/{mm => lib}/rd.c (98%)

diff --git a/kernel/Makefile b/kernel/Makefile
index 55d33982e..fa6d40f92 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -177,11 +177,11 @@ GENERIC_SOURCES = \
 	generic/src/mm/backend_elf.c \
 	generic/src/mm/backend_phys.c \
 	generic/src/mm/slab.c \
-	generic/src/mm/rd.c \
 	generic/src/lib/func.c \
 	generic/src/lib/memstr.c \
 	generic/src/lib/sort.c \
 	generic/src/lib/elf.c \
+	generic/src/lib/rd.c \
 	generic/src/printf/printf_core.c \
 	generic/src/printf/printf.c \
 	generic/src/printf/sprintf.c \
diff --git a/kernel/generic/include/elf.h b/kernel/generic/include/lib/elf.h
similarity index 100%
rename from kernel/generic/include/elf.h
rename to kernel/generic/include/lib/elf.h
diff --git a/kernel/generic/include/mm/rd.h b/kernel/generic/include/lib/rd.h
similarity index 100%
rename from kernel/generic/include/mm/rd.h
rename to kernel/generic/include/lib/rd.h
diff --git a/kernel/generic/include/mm/as.h b/kernel/generic/include/mm/as.h
index 03044add1..3b731cb36 100644
--- a/kernel/generic/include/mm/as.h
+++ b/kernel/generic/include/mm/as.h
@@ -52,7 +52,7 @@
 #include <synch/mutex.h>
 #include <adt/list.h>
 #include <adt/btree.h>
-#include <elf.h>
+#include <lib/elf.h>
 
 /** Defined to be true if user address space and kernel address space shadow each other. */
 #define KERNEL_ADDRESS_SPACE_SHADOWED	KERNEL_ADDRESS_SPACE_SHADOWED_ARCH
diff --git a/kernel/generic/src/lib/elf.c b/kernel/generic/src/lib/elf.c
index fb240dbf1..8bb2007c8 100644
--- a/kernel/generic/src/lib/elf.c
+++ b/kernel/generic/src/lib/elf.c
@@ -36,7 +36,7 @@
  * @brief	Kernel ELF loader.
  */
 
-#include <elf.h>
+#include <lib/elf.h>
 #include <debug.h>
 #include <arch/types.h>
 #include <typedefs.h>
diff --git a/kernel/generic/src/mm/rd.c b/kernel/generic/src/lib/rd.c
similarity index 98%
rename from kernel/generic/src/mm/rd.c
rename to kernel/generic/src/lib/rd.c
index 08d754ff4..781d0f9e5 100644
--- a/kernel/generic/src/mm/rd.c
+++ b/kernel/generic/src/lib/rd.c
@@ -37,7 +37,7 @@
  * Support for RAM disk images.
  */
 
-#include <mm/rd.h>
+#include <lib/rd.h>
 
 bool init_rd(void * addr)
 {
diff --git a/kernel/generic/src/main/kinit.c b/kernel/generic/src/main/kinit.c
index e2e57736c..b47f9b6f8 100644
--- a/kernel/generic/src/main/kinit.c
+++ b/kernel/generic/src/main/kinit.c
@@ -61,7 +61,7 @@
 #include <interrupt.h>
 #include <console/kconsole.h>
 #include <security/cap.h>
-#include <mm/rd.h>
+#include <lib/rd.h>
 
 #ifdef CONFIG_SMP
 #include <smp/smp.h>
diff --git a/kernel/generic/src/mm/backend_elf.c b/kernel/generic/src/mm/backend_elf.c
index dc8210e1a..2f343110f 100644
--- a/kernel/generic/src/mm/backend_elf.c
+++ b/kernel/generic/src/mm/backend_elf.c
@@ -35,7 +35,7 @@
  * @brief	Backend for address space areas backed by an ELF image.
  */
 
-#include <elf.h>
+#include <lib/elf.h>
 #include <debug.h>
 #include <arch/types.h>
 #include <typedefs.h>
diff --git a/kernel/generic/src/proc/task.c b/kernel/generic/src/proc/task.c
index 70bfe5d72..c4fbbe1f4 100644
--- a/kernel/generic/src/proc/task.c
+++ b/kernel/generic/src/proc/task.c
@@ -50,7 +50,7 @@
 #include <security/cap.h>
 #include <memstr.h>
 #include <print.h>
-#include <elf.h>
+#include <lib/elf.h>
 #include <errno.h>
 #include <syscall/copy.h>
 #include <console/klog.h>
-- 
2.11.4.GIT