modify include lines and Makefiles

executer/kernel/Makefile

@@ -1,17 +1,12 @@
-
-#ifeq ($(K),"current")
-KDIR=/lib/modules/`uname -r `/build
-#else
-#KDIR=../target
-#endif
-
+KDIR ?= /lib/modules/`uname -r `/build
 
 obj-m += mcctrl.o
 
 mcctrl-objs := driver.o control.o ikc.o syscall.o
 
-AALBASE ?= $(src)/../../../aal
-EXTRA_CFLAGS = -I$(AALBASE)/host/include -I$(AALBASE)/host/driver/knf -I$(AALBASE)/include -I$(AALBASE)/ikc/include -I$(src)/../include
+IHK_BASE=$(src)/../../../ihk
+EXTRA_CFLAGS = -I$(IHK_BASE)/linux/include -I$(IHK_BASE)/ikc/include -I$(IHK_BASE)/include -I$(src)/../include
+KBUILD_EXTRA_SYMBOLS = $(IHK_BASE)/linux/core/Module.symvers
 
 .PHONY: clean install
 

executer/kernel/control.c

@@ -8,7 +8,6 @@
 #include <asm/delay.h>
 #include <asm/msr.h>
 #include <asm/io.h>
-#include <sysdeps/knf/mic/mic_type.h>
 #include "mcctrl.h"
 
 #ifdef DEBUG

executer/kernel/driver.c

@@ -7,7 +7,6 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
-#include <sysdeps/knf/mic/mic_type.h>
 #include "mcctrl.h"
 
 extern long __mcctrl_control(aal_os_t, unsigned int, unsigned long);

executer/kernel/ikc.c

@@ -4,9 +4,9 @@
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
 #include "mcctrl.h"
-#include <aal/ikc.h>
+#include <ihk/ikc.h>
 #include <ikc/master.h>
-#include <sysdeps/knf/mic/micconst.h>
+#include <sysdeps/mic/mic/micconst.h>
 
 #define REQUEST_SHIFT    16
 

executer/kernel/mcctrl.h

@@ -1,7 +1,7 @@
 #ifndef HEADER_MCCTRL_H
 #define HEADER_MCCTRL_H
 
-#include <aal/aal_host_driver.h>
+#include <ihk/ihk_host_driver.h>
 #include <uprotocol.h>
 #include <linux/wait.h>