modify include lines and Makefiles

arch/x86/kernel/cpu.c

@@ -1,5 +1,5 @@
-#include <aal/cpu.h>
-#include <aal/debug.h>
+#include <ihk/cpu.h>
+#include <ihk/debug.h>
 #include <types.h>
 #include <errno.h>
 #include <list.h>

arch/x86/kernel/include/arch-lock.h

@@ -4,7 +4,7 @@
 #ifndef __HEADER_X86_COMMON_ARCH_LOCK
 #define __HEADER_X86_COMMON_ARCH_LOCK
 
-#include <aal/cpu.h>
+#include <ihk/cpu.h>
 
 //#define DEBUG_SPINLOCK
 

arch/x86/kernel/include/ihk/ikc.h

@@ -1,7 +1,7 @@
 #ifndef HEADER_X86_COMMON_AAL_IKC_H
 #define HEADER_X86_COMMON_AAL_IKC_H
 
-#include <ikc/aal.h>
+#include <ikc/ihk.h>
 
 /* manycore side */
 int aal_mc_ikc_init_first(struct aal_ikc_channel_desc *,

arch/x86/kernel/local.c

@@ -1,8 +1,8 @@
 #include <cpulocal.h>
-#include <aal/atomic.h>
-#include <aal/mm.h>
-#include <aal/cpu.h>
-#include <aal/debug.h>
+#include <ihk/atomic.h>
+#include <ihk/mm.h>
+#include <ihk/cpu.h>
+#include <ihk/debug.h>
 #include <registers.h>
 #include <string.h>
 

arch/x86/kernel/lock.c

@@ -1,4 +1,4 @@
-#include <aal/lock.h>
+#include <ihk/lock.h>
 
 #if 0
 

arch/x86/kernel/memory.c

@@ -1,6 +1,6 @@
-#include <aal/cpu.h>
-#include <aal/debug.h>
-#include <aal/mm.h>
+#include <ihk/cpu.h>
+#include <ihk/debug.h>
+#include <ihk/mm.h>
 #include <types.h>
 #include <memory.h>
 #include <string.h>

arch/x86/kernel/mikc.c

@@ -1,5 +1,5 @@
-#include <aal/ikc.h>
-#include <aal/lock.h>
+#include <ihk/ikc.h>
+#include <ihk/lock.h>
 #include <ikc/msg.h>
 #include <memory.h>
 #include <string.h>

arch/x86/kernel/perfctr.c

@@ -1,7 +1,7 @@
-#include <aal/perfctr.h>
+#include <ihk/perfctr.h>
 #include <march.h>
 #include <errno.h>
-#include <aal/debug.h>
+#include <ihk/debug.h>
 #include <registers.h>
 
 extern unsigned int *x86_march_perfmap;