modify include lines and Makefiles

kernel/include/amemcpy.h

@@ -1,7 +1,7 @@
 #ifndef HEADER_AMEMCPY_H
 #define HEADER_AMEMCPY_H
 
-#include <aal/cpu.h>
+#include <ihk/cpu.h>
 
 static void memcpy_async_wait(unsigned long *notify)
 {

kernel/include/cls.h

@@ -12,7 +12,7 @@ struct malloc_header {
 	unsigned long size;
 };
 
-#include <aal/lock.h>
+#include <ihk/lock.h>
 #define CPU_STATUS_DISABLE	(0)
 #define CPU_STATUS_IDLE		(1)
 #define CPU_STATUS_RUNNING	(2)

kernel/include/futex.h

@@ -55,7 +55,7 @@
 
 #ifdef __KERNEL__
 
-#include <aal/lock.h>
+#include <ihk/lock.h>
 #include <list.h>
 #include <process.h>
 #include <waitq.h>

kernel/include/kmalloc.h

@@ -1,7 +1,7 @@
 #ifndef __HEADER_KMALLOC_H
 #define __HEADER_KMALLOC_H
 
-#include <aal/mm.h>
+#include <ihk/mm.h>
 
 void *kmalloc(int size, enum aal_mc_ap_flag flag);
 void kfree(void *ptr);

kernel/include/process.h

@@ -1,10 +1,10 @@
 #ifndef HEADER_PROCESS_H
 #define HEADER_PROCESS_H
 
-#include <aal/context.h>
-#include <aal/cpu.h>
-#include <aal/mm.h>
-#include <aal/atomic.h>
+#include <ihk/context.h>
+#include <ihk/cpu.h>
+#include <ihk/mm.h>
+#include <ihk/atomic.h>
 #include <list.h>
 
 #define VR_STACK           0x1

kernel/include/syscall.h

@@ -1,7 +1,7 @@
 #ifndef __HEADER_SYSCALL_H
 #define __HEADER_SYSCALL_H
 
-#include <aal/memconst.h>
+#include <ihk/memconst.h>
 
 #define NUM_SYSCALLS 255
 

kernel/include/timer.h

@@ -1,17 +1,17 @@
 #include <types.h>
 #include <kmsg.h>
-#include <aal/cpu.h>
+#include <ihk/cpu.h>
 #include <cpulocal.h>
-#include <aal/mm.h>
-#include <aal/debug.h>
-#include <aal/ikc.h>
+#include <ihk/mm.h>
+#include <ihk/debug.h>
+#include <ihk/ikc.h>
 #include <errno.h>
 #include <cls.h>
 #include <syscall.h>
 #include <page.h>
 #include <amemcpy.h>
 #include <uio.h>
-#include <aal/lock.h>
+#include <ihk/lock.h>
 #include <ctype.h>
 #include <waitq.h>
 #include <rlimit.h>

kernel/include/waitq.h

@@ -3,7 +3,7 @@
 
 /* Kitten waitqueue adaptation */
 
-#include <aal/lock.h>
+#include <ihk/lock.h>
 #include <list.h>
 
 struct process;