From 12eb8a9bb024eaa963ee823723256ade9fd50ab6 Mon Sep 17 00:00:00 2001 From: Yoichi Umezawa Date: Tue, 24 Nov 2015 15:42:04 +0900 Subject: [PATCH] mcctrl: move mcctrl to executer/kernel/mcctrl --- Makefile.in | 6 +++--- configure | 4 ++-- configure.ac | 2 +- executer/kernel/{ => mcctrl}/Makefile.in | 6 +++--- executer/kernel/{ => mcctrl}/binfmt_mcexec.c | 0 executer/kernel/{ => mcctrl}/control.c | 0 executer/kernel/{ => mcctrl}/driver.c | 0 executer/kernel/{ => mcctrl}/ikc.c | 0 executer/kernel/{ => mcctrl}/mcctrl.h | 0 executer/kernel/{ => mcctrl}/procfs.c | 0 executer/kernel/{ => mcctrl}/syscall.c | 0 11 files changed, 9 insertions(+), 9 deletions(-) rename executer/kernel/{ => mcctrl}/Makefile.in (68%) rename executer/kernel/{ => mcctrl}/binfmt_mcexec.c (100%) rename executer/kernel/{ => mcctrl}/control.c (100%) rename executer/kernel/{ => mcctrl}/driver.c (100%) rename executer/kernel/{ => mcctrl}/ikc.c (100%) rename executer/kernel/{ => mcctrl}/mcctrl.h (100%) rename executer/kernel/{ => mcctrl}/procfs.c (100%) rename executer/kernel/{ => mcctrl}/syscall.c (100%) diff --git a/Makefile.in b/Makefile.in index 391d9684..943fc3b6 100755 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,7 @@ SBINDIR = @SBINDIR@ MANDIR = @MANDIR@ all:: - @(cd executer/kernel; make modules) + @(cd executer/kernel/mcctrl; make modules) @(cd executer/user; make) @case "$(TARGET)" in \ attached-mic | builtin-x86 | builtin-mic | smp-x86) \ @@ -16,7 +16,7 @@ all:: esac install:: - @(cd executer/kernel; make install) + @(cd executer/kernel/mcctrl; make install) @(cd executer/user; make install) @case "$(TARGET)" in \ attached-mic | builtin-x86 | builtin-mic | smp-x86) \ @@ -56,7 +56,7 @@ install:: esac clean:: - @(cd executer/kernel; make clean) + @(cd executer/kernel/mcctrl; make clean) @(cd executer/user; make clean) @case "$(TARGET)" in \ attached-mic | builtin-x86 | builtin-mic | smp-x86) \ diff --git a/configure b/configure index e529b2a6..60ccb2b5 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 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/mcstop+release-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/mcctrl/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/mcstop+release-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 : @@ -4532,7 +4532,7 @@ do case $ac_config_target in "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/Makefile") CONFIG_FILES="$CONFIG_FILES executer/kernel/mcctrl/Makefile" ;; "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 a478711c..55d6b29c 100644 --- a/configure.ac +++ b/configure.ac @@ -160,7 +160,7 @@ AC_SUBST(DCFA_RESEASE_DATE) AC_CONFIG_FILES([ Makefile executer/user/Makefile - executer/kernel/Makefile + executer/kernel/mcctrl/Makefile kernel/Makefile kernel/Makefile.build arch/x86/tools/mcreboot-attached-mic.sh diff --git a/executer/kernel/Makefile.in b/executer/kernel/mcctrl/Makefile.in similarity index 68% rename from executer/kernel/Makefile.in rename to executer/kernel/mcctrl/Makefile.in index 81303c90..8d14448e 100644 --- a/executer/kernel/Makefile.in +++ b/executer/kernel/mcctrl/Makefile.in @@ -3,15 +3,15 @@ ARCH ?= @ARCH@ src = @abs_srcdir@ KMODDIR=@KMODDIR@ BINDIR=@BINDIR@ -IHK_BASE=$(src)/../../../ihk +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 -DMCEXEC_PATH=\"$(BINDIR)/mcexec\" +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 -KBUILD_EXTRA_SYMBOLS = @abs_builddir@/../../../ihk/linux/core/Module.symvers +KBUILD_EXTRA_SYMBOLS = @abs_builddir@/../../../../ihk/linux/core/Module.symvers .PHONY: clean install modules diff --git a/executer/kernel/binfmt_mcexec.c b/executer/kernel/mcctrl/binfmt_mcexec.c similarity index 100% rename from executer/kernel/binfmt_mcexec.c rename to executer/kernel/mcctrl/binfmt_mcexec.c diff --git a/executer/kernel/control.c b/executer/kernel/mcctrl/control.c similarity index 100% rename from executer/kernel/control.c rename to executer/kernel/mcctrl/control.c diff --git a/executer/kernel/driver.c b/executer/kernel/mcctrl/driver.c similarity index 100% rename from executer/kernel/driver.c rename to executer/kernel/mcctrl/driver.c diff --git a/executer/kernel/ikc.c b/executer/kernel/mcctrl/ikc.c similarity index 100% rename from executer/kernel/ikc.c rename to executer/kernel/mcctrl/ikc.c diff --git a/executer/kernel/mcctrl.h b/executer/kernel/mcctrl/mcctrl.h similarity index 100% rename from executer/kernel/mcctrl.h rename to executer/kernel/mcctrl/mcctrl.h diff --git a/executer/kernel/procfs.c b/executer/kernel/mcctrl/procfs.c similarity index 100% rename from executer/kernel/procfs.c rename to executer/kernel/mcctrl/procfs.c diff --git a/executer/kernel/syscall.c b/executer/kernel/mcctrl/syscall.c similarity index 100% rename from executer/kernel/syscall.c rename to executer/kernel/mcctrl/syscall.c