diff --git a/configure b/configure index aae709e1..d9d8c5ad 100755 --- a/configure +++ b/configure @@ -3816,7 +3816,7 @@ TARGET="$WITH_TARGET" -ac_config_files="$ac_config_files Makefile executer/user/Makefile executer/kernel/Makefile executer/kernel/mcctrl.h kernel/Makefile kernel/Makefile.build arch/x86/tools/mcreboot-attached-mic.sh arch/x86/tools/mcshutdown-attached-mic.sh arch/x86/tools/mcreboot-builtin-x86.sh arch/x86/tools/mcreboot-smp-x86.sh arch/x86/tools/mcshutdown-builtin-x86.sh arch/x86/tools/mcreboot.1:arch/x86/tools/mcreboot.1in" +ac_config_files="$ac_config_files Makefile executer/user/Makefile executer/kernel/Makefile kernel/Makefile kernel/Makefile.build arch/x86/tools/mcreboot-attached-mic.sh arch/x86/tools/mcshutdown-attached-mic.sh arch/x86/tools/mcreboot-builtin-x86.sh arch/x86/tools/mcreboot-smp-x86.sh arch/x86/tools/mcshutdown-builtin-x86.sh arch/x86/tools/mcreboot.1:arch/x86/tools/mcreboot.1in" if test "x$enable_dcfa" = xyes; then : @@ -4533,7 +4533,6 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "executer/user/Makefile") CONFIG_FILES="$CONFIG_FILES executer/user/Makefile" ;; "executer/kernel/Makefile") CONFIG_FILES="$CONFIG_FILES executer/kernel/Makefile" ;; - "executer/kernel/mcctrl.h") CONFIG_FILES="$CONFIG_FILES executer/kernel/mcctrl.h" ;; "kernel/Makefile") CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;; "kernel/Makefile.build") CONFIG_FILES="$CONFIG_FILES kernel/Makefile.build" ;; "arch/x86/tools/mcreboot-attached-mic.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcreboot-attached-mic.sh" ;; diff --git a/configure.ac b/configure.ac index eab1a355..fab17194 100644 --- a/configure.ac +++ b/configure.ac @@ -161,7 +161,6 @@ AC_CONFIG_FILES([ Makefile executer/user/Makefile executer/kernel/Makefile - executer/kernel/mcctrl.h kernel/Makefile kernel/Makefile.build arch/x86/tools/mcreboot-attached-mic.sh diff --git a/executer/kernel/Makefile.in b/executer/kernel/Makefile.in index 51f04bc8..81303c90 100644 --- a/executer/kernel/Makefile.in +++ b/executer/kernel/Makefile.in @@ -2,11 +2,12 @@ KDIR ?= @KDIR@ ARCH ?= @ARCH@ src = @abs_srcdir@ KMODDIR=@KMODDIR@ +BINDIR=@BINDIR@ IHK_BASE=$(src)/../../../ihk obj-m += mcctrl.o -ccflags-y := -I$(IHK_BASE)/linux/include -I$(IHK_BASE)/ikc/include -I$(IHK_BASE)/include -I$(src)/../include -mcmodel=kernel -mno-red-zone +ccflags-y := -I$(IHK_BASE)/linux/include -I$(IHK_BASE)/ikc/include -I$(IHK_BASE)/include -I$(src)/../include -mcmodel=kernel -mno-red-zone -DMCEXEC_PATH=\"$(BINDIR)/mcexec\" mcctrl-y := driver.o control.o ikc.o syscall.o procfs.o binfmt_mcexec.o diff --git a/executer/kernel/mcctrl.h.in b/executer/kernel/mcctrl.h similarity index 99% rename from executer/kernel/mcctrl.h.in rename to executer/kernel/mcctrl.h index a7ac0d26..35e52a1b 100644 --- a/executer/kernel/mcctrl.h.in +++ b/executer/kernel/mcctrl.h @@ -38,8 +38,6 @@ #include #include -#define MCEXEC_PATH "@BINDIR@/mcexec" - #define SCD_MSG_PREPARE_PROCESS 0x1 #define SCD_MSG_PREPARE_PROCESS_ACKED 0x2 #define SCD_MSG_PREPARE_PROCESS_NACKED 0x7