gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mcctrl: move mcctrl to executer/kernel/mcctrl

Browse Source
This commit is contained in:
Yoichi Umezawa
2015-11-24 15:42:04 +09:00
parent 828a3ea57a
commit 12eb8a9bb0
11 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@ -3,7 +3,7 @@ SBINDIR = @SBINDIR@
MANDIR = @MANDIR@ MANDIR = @MANDIR@
all:: all::
@(cd executer/kernel; make modules) @(cd executer/kernel/mcctrl; make modules)
@(cd executer/user; make) @(cd executer/user; make)
@case "$(TARGET)" in \ @case "$(TARGET)" in \
attached-mic | builtin-x86 | builtin-mic | smp-x86) \ attached-mic | builtin-x86 | builtin-mic | smp-x86) \
@ -16,7 +16,7 @@ all::
esac esac
install:: install::
@(cd executer/kernel; make install) @(cd executer/kernel/mcctrl; make install)
@(cd executer/user; make install) @(cd executer/user; make install)
@case "$(TARGET)" in \ @case "$(TARGET)" in \
attached-mic | builtin-x86 | builtin-mic | smp-x86) \ attached-mic | builtin-x86 | builtin-mic | smp-x86) \
@ -56,7 +56,7 @@ install::
esac esac
clean:: clean::
@(cd executer/kernel; make clean) @(cd executer/kernel/mcctrl; make clean)
@(cd executer/user; make clean) @(cd executer/user; make clean)
@case "$(TARGET)" in \ @case "$(TARGET)" in \
attached-mic | builtin-x86 | builtin-mic | smp-x86) \ attached-mic | builtin-x86 | builtin-mic | smp-x86) \

4
configure vendored
View File

@ -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 : if test "x$enable_dcfa" = xyes; then :
@ -4532,7 +4532,7 @@ do
case $ac_config_target in case $ac_config_target in
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"executer/user/Makefile") CONFIG_FILES="$CONFIG_FILES executer/user/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") CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;;
"kernel/Makefile.build") CONFIG_FILES="$CONFIG_FILES kernel/Makefile.build" ;; "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" ;; "arch/x86/tools/mcreboot-attached-mic.sh") CONFIG_FILES="$CONFIG_FILES arch/x86/tools/mcreboot-attached-mic.sh" ;;

2
configure.ac
View File

@ -160,7 +160,7 @@ AC_SUBST(DCFA_RESEASE_DATE)
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
executer/user/Makefile executer/user/Makefile
executer/kernel/Makefile executer/kernel/mcctrl/Makefile
kernel/Makefile kernel/Makefile
kernel/Makefile.build kernel/Makefile.build
arch/x86/tools/mcreboot-attached-mic.sh arch/x86/tools/mcreboot-attached-mic.sh

6
executer/kernel/Makefile.in → executer/kernel/mcctrl/Makefile.in
View File

@ -3,15 +3,15 @@ ARCH ?= @ARCH@
src = @abs_srcdir@ src = @abs_srcdir@
KMODDIR=@KMODDIR@ KMODDIR=@KMODDIR@
BINDIR=@BINDIR@ BINDIR=@BINDIR@
IHK_BASE=$(src)/../../../ihk IHK_BASE=$(src)/../../../../ihk
obj-m += mcctrl.o 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 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 .PHONY: clean install modules

0
executer/kernel/binfmt_mcexec.c → executer/kernel/mcctrl/binfmt_mcexec.c
View File

0
executer/kernel/control.c → executer/kernel/mcctrl/control.c
View File

0
executer/kernel/driver.c → executer/kernel/mcctrl/driver.c
View File

0
executer/kernel/ikc.c → executer/kernel/mcctrl/ikc.c
View File

0
executer/kernel/mcctrl.h → executer/kernel/mcctrl/mcctrl.h
View File

0
executer/kernel/procfs.c → executer/kernel/mcctrl/procfs.c
View File

0
executer/kernel/syscall.c → executer/kernel/mcctrl/syscall.c
View File