From 6f61488f217b366942e46b4112b85701a70ef95f Mon Sep 17 00:00:00 2001 From: Alexander Kartashov Date: Wed, 9 Jan 2013 17:02:47 +0400 Subject: [PATCH] x86: moved x86-specific files into the directory arch/x86. * The following files goes into the directory arch/x86/include/asm unmodified: - include/atomic.h, - include/linkage.h, - include/memcpy_64.h, - include/types.h, - include/bitops.h, - pie/parasite-head-x86-64.S, - include/processor-flags.h, - include/syscall-x86-64.def. * Changed include directives in the source files that include the headers listed above. * Modified build scripts to reflect the source moves. Signed-off-by: Alexander Kartashov Signed-off-by: Pavel Emelyanov --- Makefile | 5 +++-- arch/x86/Makefile | 3 ++- {include => arch/x86/include/asm}/atomic.h | 2 +- {include => arch/x86/include/asm}/bitops.h | 0 {include => arch/x86/include/asm}/linkage.h | 0 {include => arch/x86/include/asm}/memcpy_64.h | 2 +- {include => arch/x86/include/asm}/processor-flags.h | 0 {include => arch/x86/include/asm}/types.h | 8 ++++---- pie/parasite-head-x86-64.S => arch/x86/parasite-head.S | 2 +- arch/x86/syscall-common-x86-64.S | 2 +- {include => arch/x86}/syscall-x86-64.def | 0 cpu.c | 4 ++-- cr-dump.c | 2 +- cr-restore.c | 2 +- cr-show.c | 2 +- crtools.c | 2 +- eventfd.c | 2 +- eventpoll.c | 2 +- file-ids.c | 2 +- files-reg.c | 2 +- include/cpu.h | 2 +- include/crtools.h | 2 +- include/eventfd.h | 2 +- include/eventpoll.h | 2 +- include/file-ids.h | 2 +- include/files-reg.h | 2 +- include/files.h | 2 +- include/fpu.h | 2 +- include/image.h | 2 +- include/inotify.h | 2 +- include/lock.h | 4 ++-- include/proc_parse.h | 2 +- include/protobuf.h | 2 +- include/rbtree.h | 2 +- include/restorer.h | 2 +- include/sk-queue.h | 2 +- include/sockets.h | 2 +- include/syscall-types.h | 2 +- include/unix_diag.h | 2 +- include/util.h | 2 +- inotify.c | 2 +- kcmp-ids.c | 2 +- log.c | 2 +- mount.c | 2 +- netfilter.c | 2 +- parasite-syscall.c | 2 +- pie/Makefile | 2 +- pie/restorer.c | 2 +- proc_parse.c | 2 +- protobuf.c | 2 +- ptrace.c | 2 +- signalfd.c | 2 +- sk-inet.c | 2 +- sk-packet.c | 2 +- sk-queue.c | 2 +- sk-tcp.c | 2 +- sk-unix.c | 2 +- sysctl.c | 2 +- tty.c | 2 +- util-net.c | 4 ++-- util.c | 2 +- 61 files changed, 66 insertions(+), 64 deletions(-) rename {include => arch/x86/include/asm}/atomic.h (98%) rename {include => arch/x86/include/asm}/bitops.h (100%) rename {include => arch/x86/include/asm}/linkage.h (100%) rename {include => arch/x86/include/asm}/memcpy_64.h (95%) rename {include => arch/x86/include/asm}/processor-flags.h (100%) rename {include => arch/x86/include/asm}/types.h (97%) rename pie/parasite-head-x86-64.S => arch/x86/parasite-head.S (95%) rename {include => arch/x86}/syscall-x86-64.def (100%) diff --git a/Makefile b/Makefile index 6f0d479d6..40d9a7577 100644 --- a/Makefile +++ b/Makefile @@ -41,8 +41,9 @@ ifeq ($(uname_M),x86_64) endif SRC_DIR ?= $(shell pwd) +ARCH_DIR := $(SRC_DIR)/arch/$(ARCH) -CFLAGS = -I$(SRC_DIR)/include -I$(SRC_DIR)/pie -I$(SRC_DIR)/arch/$(ARCH)/ -fno-strict-aliasing +CFLAGS += -I$(SRC_DIR)/include -I$(SRC_DIR)/pie -I$(ARCH_DIR) -iquote $(ARCH_DIR)/include -fno-strict-aliasing LIBS := -lrt -lpthread -lprotobuf-c @@ -70,7 +71,7 @@ CFLAGS += $(WARNINGS) $(DEFINES) SYSCALL-LIB = $(SRC_DIR)/arch/$(ARCH)/syscalls.o PROTOBUF-LIB = $(SRC_DIR)/protobuf/protobuf-lib.o -export E Q CC ECHO MAKE CFLAGS LIBS ARCH DEFINES MAKEFLAGS SRC_DIR SYSCALL-LIB SH +export E Q CC ECHO MAKE CFLAGS LIBS ARCH DEFINES MAKEFLAGS SRC_DIR SYSCALL-LIB SH ARCH_DIR PROGRAM := crtools diff --git a/arch/x86/Makefile b/arch/x86/Makefile index c0108a1f9..3e8df6047 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -1,4 +1,4 @@ -SYS-DEF := $(SRC_DIR)/include/syscall-x86-64.def +SYS-DEF := $(ARCH_DIR)/syscall-x86-64.def SYS-ASM-COMMON := syscall-common-x86-64.S SYS-TYPES := $(SRC_DIR)/include/syscall-types.h @@ -47,5 +47,6 @@ clean: $(Q) $(RM) -f $(SYS-PROTO) $(Q) $(RM) -f $(SYS-OBJ) $(Q) $(RM) -f $(SYS-EXEC-TBL) + $(Q) $(RM) -f *.o *.d .PHONY: clean x86 diff --git a/include/atomic.h b/arch/x86/include/asm/atomic.h similarity index 98% rename from include/atomic.h rename to arch/x86/include/asm/atomic.h index 84083864e..273d595f4 100644 --- a/include/atomic.h +++ b/arch/x86/include/asm/atomic.h @@ -1,7 +1,7 @@ #ifndef __CR_ATOMIC_H__ #define __CR_ATOMIC_H__ -#include "types.h" +#include "asm/types.h" typedef struct { u32 counter; diff --git a/include/bitops.h b/arch/x86/include/asm/bitops.h similarity index 100% rename from include/bitops.h rename to arch/x86/include/asm/bitops.h diff --git a/include/linkage.h b/arch/x86/include/asm/linkage.h similarity index 100% rename from include/linkage.h rename to arch/x86/include/asm/linkage.h diff --git a/include/memcpy_64.h b/arch/x86/include/asm/memcpy_64.h similarity index 95% rename from include/memcpy_64.h rename to arch/x86/include/asm/memcpy_64.h index 20f11cdb9..e7012c026 100644 --- a/include/memcpy_64.h +++ b/arch/x86/include/asm/memcpy_64.h @@ -2,7 +2,7 @@ #define __CR_MEMCPY_64_H__ #include "compiler.h" -#include "types.h" +#include "asm/types.h" static always_inline void *builtin_memcpy(void *to, const void *from, unsigned int n) { diff --git a/include/processor-flags.h b/arch/x86/include/asm/processor-flags.h similarity index 100% rename from include/processor-flags.h rename to arch/x86/include/asm/processor-flags.h diff --git a/include/types.h b/arch/x86/include/asm/types.h similarity index 97% rename from include/types.h rename to arch/x86/include/asm/types.h index f29975215..bf33946b5 100644 --- a/include/types.h +++ b/arch/x86/include/asm/types.h @@ -1,11 +1,11 @@ -#ifndef __CR_TYPES_H__ -#define __CR_TYPES_H__ +#ifndef __CR_ASM_TYPES_H__ +#define __CR_ASM_TYPES_H__ #include #include #include -#include "bitops.h" +#include "asm/bitops.h" /* prctl */ #define ARCH_SET_GS 0x1001 @@ -245,4 +245,4 @@ typedef struct { # define MADV_DONTDUMP 16 #endif -#endif /* __CR_TYPES_H__ */ +#endif /* __CR_ASM_TYPES_H__ */ diff --git a/pie/parasite-head-x86-64.S b/arch/x86/parasite-head.S similarity index 95% rename from pie/parasite-head-x86-64.S rename to arch/x86/parasite-head.S index a2c12dc61..289672cdd 100644 --- a/pie/parasite-head-x86-64.S +++ b/arch/x86/parasite-head.S @@ -1,4 +1,4 @@ -#include "linkage.h" +#include "asm/linkage.h" #include "parasite.h" .section .head.text, "ax" diff --git a/arch/x86/syscall-common-x86-64.S b/arch/x86/syscall-common-x86-64.S index 84bcd8b01..a54920756 100644 --- a/arch/x86/syscall-common-x86-64.S +++ b/arch/x86/syscall-common-x86-64.S @@ -1,4 +1,4 @@ -#include "linkage.h" +#include "asm/linkage.h" #define SYSCALL(name, opcode) \ ENTRY(name); \ diff --git a/include/syscall-x86-64.def b/arch/x86/syscall-x86-64.def similarity index 100% rename from include/syscall-x86-64.def rename to arch/x86/syscall-x86-64.def diff --git a/cpu.c b/cpu.c index a29fe86a8..983ca5053 100644 --- a/cpu.c +++ b/cpu.c @@ -7,10 +7,10 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "log.h" #include "util.h" -#include "bitops.h" +#include "asm/bitops.h" #include "proc_parse.h" diff --git a/cr-dump.c b/cr-dump.c index 00af5340c..a6693a8c4 100644 --- a/cr-dump.c +++ b/cr-dump.c @@ -30,7 +30,7 @@ #include "protobuf/creds.pb-c.h" #include "protobuf/core.pb-c.h" -#include "types.h" +#include "asm/types.h" #include "list.h" #include "file-ids.h" #include "kcmp-ids.h" diff --git a/cr-restore.c b/cr-restore.c index 516ace612..ec5bd4c99 100644 --- a/cr-restore.c +++ b/cr-restore.c @@ -25,7 +25,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "image.h" #include "util.h" diff --git a/cr-show.c b/cr-show.c index 48031f830..61373be50 100644 --- a/cr-show.c +++ b/cr-show.c @@ -12,7 +12,7 @@ #include #include -#include "types.h" +#include "asm/types.h" #include "list.h" #include "namespaces.h" #include "compiler.h" diff --git a/crtools.c b/crtools.c index b4f4b5381..7cc7e631f 100644 --- a/crtools.c +++ b/crtools.c @@ -12,7 +12,7 @@ #include #include -#include "types.h" +#include "asm/types.h" #include "compiler.h" #include "crtools.h" diff --git a/eventfd.c b/eventfd.c index 75c8b8472..1e48af2a1 100644 --- a/eventfd.c +++ b/eventfd.c @@ -13,7 +13,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "eventfd.h" #include "proc_parse.h" #include "crtools.h" diff --git a/eventpoll.c b/eventpoll.c index c67bc07da..ccce771be 100644 --- a/eventpoll.c +++ b/eventpoll.c @@ -13,7 +13,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "eventpoll.h" #include "proc_parse.h" #include "crtools.h" diff --git a/file-ids.c b/file-ids.c index 690713e15..22b3ac515 100644 --- a/file-ids.c +++ b/file-ids.c @@ -9,7 +9,7 @@ #include -#include "types.h" +#include "asm/types.h" #include "file-ids.h" #include "rbtree.h" #include "kcmp-ids.h" diff --git a/files-reg.c b/files-reg.c index c99c34940..cf4fd7152 100644 --- a/files-reg.c +++ b/files-reg.c @@ -12,7 +12,7 @@ #include "image.h" #include "list.h" #include "util.h" -#include "atomic.h" +#include "asm/atomic.h" #include "protobuf.h" #include "protobuf/regfile.pb-c.h" diff --git a/include/cpu.h b/include/cpu.h index 63ebe4a99..15022858d 100644 --- a/include/cpu.h +++ b/include/cpu.h @@ -1,7 +1,7 @@ #ifndef __CR_CPU_H__ #define __CR_CPU_H__ -#include "types.h" +#include "asm/types.h" /* * Adopted from linux kernel. diff --git a/include/crtools.h b/include/crtools.h index 326f0df58..08c9655b7 100644 --- a/include/crtools.h +++ b/include/crtools.h @@ -4,7 +4,7 @@ #include #include "list.h" -#include "types.h" +#include "asm/types.h" #include "list.h" #include "util.h" #include "image.h" diff --git a/include/eventfd.h b/include/eventfd.h index a5b46181f..751541089 100644 --- a/include/eventfd.h +++ b/include/eventfd.h @@ -5,7 +5,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "files.h" #include "crtools.h" diff --git a/include/eventpoll.h b/include/eventpoll.h index 4928258b4..a2f5f1150 100644 --- a/include/eventpoll.h +++ b/include/eventpoll.h @@ -5,7 +5,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "files.h" #include "crtools.h" diff --git a/include/file-ids.h b/include/file-ids.h index 86e16b8ea..9e3817391 100644 --- a/include/file-ids.h +++ b/include/file-ids.h @@ -2,7 +2,7 @@ #define __CR_FILE_IDS_H__ #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "rbtree.h" #include "../protobuf/fdinfo.pb-c.h" diff --git a/include/files-reg.h b/include/files-reg.h index 17c88c9c3..51022e7f6 100644 --- a/include/files-reg.h +++ b/include/files-reg.h @@ -1,7 +1,7 @@ #ifndef __CR_FILES_REG_H__ #define __CR_FILES_REG_H__ -#include "types.h" +#include "asm/types.h" #include "files.h" #include "image.h" diff --git a/include/files.h b/include/files.h index caefb34d5..0c727aa35 100644 --- a/include/files.h +++ b/include/files.h @@ -2,7 +2,7 @@ #define __CR_FILES_H__ #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "lock.h" #include "list.h" #include "image.h" diff --git a/include/fpu.h b/include/fpu.h index 86826633c..da717cde5 100644 --- a/include/fpu.h +++ b/include/fpu.h @@ -4,7 +4,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #define FP_MIN_ALIGN_BYTES 64 diff --git a/include/image.h b/include/image.h index 6d6a4a6a8..cdf362d79 100644 --- a/include/image.h +++ b/include/image.h @@ -1,7 +1,7 @@ #ifndef __CR_IMAGE_H__ #define __CR_IMAGE_H__ -#include "types.h" +#include "asm/types.h" #include "compiler.h" /* diff --git a/include/inotify.h b/include/inotify.h index 417f2a3e2..d45b2bc4c 100644 --- a/include/inotify.h +++ b/include/inotify.h @@ -5,7 +5,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "files.h" #include "crtools.h" diff --git a/include/lock.h b/include/lock.h index 8ef4113e2..cf976c2ab 100644 --- a/include/lock.h +++ b/include/lock.h @@ -6,8 +6,8 @@ #include #include -#include "types.h" -#include "atomic.h" +#include "asm/types.h" +#include "asm/atomic.h" #include "syscall.h" #include "util.h" diff --git a/include/proc_parse.h b/include/proc_parse.h index df72ef7d2..896b7e209 100644 --- a/include/proc_parse.h +++ b/include/proc_parse.h @@ -2,7 +2,7 @@ #define __CR_PROC_PARSE_H__ #include -#include "types.h" +#include "asm/types.h" #include "image.h" #include "list.h" diff --git a/include/protobuf.h b/include/protobuf.h index 6851c22df..4bed9f915 100644 --- a/include/protobuf.h +++ b/include/protobuf.h @@ -1,7 +1,7 @@ #ifndef __CR_PROTOBUF_H__ #define __CR_PROTOBUF_H__ -#include "types.h" +#include "asm/types.h" #include "compiler.h" #include "util.h" diff --git a/include/rbtree.h b/include/rbtree.h index a512cf3f3..f60821032 100644 --- a/include/rbtree.h +++ b/include/rbtree.h @@ -8,7 +8,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #define RB_RED 0 #define RB_BLACK 1 diff --git a/include/restorer.h b/include/restorer.h index 095f03d09..97e9958dc 100644 --- a/include/restorer.h +++ b/include/restorer.h @@ -5,7 +5,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "image.h" #include "lock.h" #include "util.h" diff --git a/include/sk-queue.h b/include/sk-queue.h index 7d134103f..6dd01c370 100644 --- a/include/sk-queue.h +++ b/include/sk-queue.h @@ -1,7 +1,7 @@ #ifndef __CR_SK_QUEUE_H__ #define __CR_SK_QUEUE_H__ -#include "types.h" +#include "asm/types.h" #include "list.h" #include "crtools.h" #include "image.h" diff --git a/include/sockets.h b/include/sockets.h index 0deadb648..ed3ac092f 100644 --- a/include/sockets.h +++ b/include/sockets.h @@ -6,7 +6,7 @@ #include #include -#include "types.h" +#include "asm/types.h" #include "protobuf.h" #include "../protobuf/sk-opts.pb-c.h" diff --git a/include/syscall-types.h b/include/syscall-types.h index 42850152e..15713fc68 100644 --- a/include/syscall-types.h +++ b/include/syscall-types.h @@ -12,7 +12,7 @@ #include #include -#include "types.h" +#include "asm/types.h" #ifndef CONFIG_X86_64 # error x86-32 bit mode not yet implemented diff --git a/include/unix_diag.h b/include/unix_diag.h index 7e7dd3394..3f2468330 100644 --- a/include/unix_diag.h +++ b/include/unix_diag.h @@ -1,7 +1,7 @@ #ifndef __CR_UNIX_DIAG_H__ #define __CR_UNIX_DIAG_H__ -#include "types.h" +#include "asm/types.h" struct unix_diag_req { u8 sdiag_family; diff --git a/include/util.h b/include/util.h index d3c85fc38..0fa5003d7 100644 --- a/include/util.h +++ b/include/util.h @@ -13,7 +13,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "log.h" #include "../protobuf/vma.pb-c.h" diff --git a/inotify.c b/inotify.c index 1e5428807..c7f736515 100644 --- a/inotify.c +++ b/inotify.c @@ -20,7 +20,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "inotify.h" #include "proc_parse.h" #include "syscall.h" diff --git a/kcmp-ids.c b/kcmp-ids.c index 6823586e1..3f75cff33 100644 --- a/kcmp-ids.c +++ b/kcmp-ids.c @@ -1,6 +1,6 @@ #include #include -#include "types.h" +#include "asm/types.h" #include "rbtree.h" #include "util.h" #include "syscall.h" diff --git a/log.c b/log.c index 5fa1c6bef..c02dff2b2 100644 --- a/log.c +++ b/log.c @@ -13,7 +13,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "util.h" #include "crtools.h" diff --git a/mount.c b/mount.c index a4c31b921..10699287a 100644 --- a/mount.c +++ b/mount.c @@ -13,7 +13,7 @@ #include #include "crtools.h" -#include "types.h" +#include "asm/types.h" #include "util.h" #include "log.h" #include "mount.h" diff --git a/netfilter.c b/netfilter.c index 44dc0f93a..13ba3c831 100644 --- a/netfilter.c +++ b/netfilter.c @@ -5,7 +5,7 @@ #include #include -#include "types.h" +#include "asm/types.h" #include "util.h" #include "list.h" #include "files.h" diff --git a/parasite-syscall.c b/parasite-syscall.c index 5e0145009..26de3ad54 100644 --- a/parasite-syscall.c +++ b/parasite-syscall.c @@ -11,7 +11,7 @@ #include "syscall.h" #include "ptrace.h" -#include "processor-flags.h" +#include "asm/processor-flags.h" #include "parasite-syscall.h" #include "parasite-blob.h" #include "parasite.h" diff --git a/pie/Makefile b/pie/Makefile index efb753250..49c22d8f6 100644 --- a/pie/Makefile +++ b/pie/Makefile @@ -3,7 +3,7 @@ CFLAGS += -fpie -Wa,--noexecstack -fno-strict-aliasing GEN-OFFSETS := gen-offsets.sh -PASM-OBJS += parasite-head-x86-64.o +PASM-OBJS += $(ARCH_DIR)/parasite-head.o PARASITE += parasite.bin.o parasite.bin RESTORER := restorer.bin.o restorer.bin diff --git a/pie/restorer.c b/pie/restorer.c index 03536ae33..337577a33 100644 --- a/pie/restorer.c +++ b/pie/restorer.c @@ -14,7 +14,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "syscall.h" #include "log.h" #include "util.h" diff --git a/proc_parse.c b/proc_parse.c index a7de1d103..81bf11c74 100644 --- a/proc_parse.c +++ b/proc_parse.c @@ -9,7 +9,7 @@ #include #include -#include "types.h" +#include "asm/types.h" #include "list.h" #include "util.h" #include "crtools.h" diff --git a/protobuf.c b/protobuf.c index f5ec1ea3c..5213d48da 100644 --- a/protobuf.c +++ b/protobuf.c @@ -10,7 +10,7 @@ #include "crtools.h" #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "log.h" #include "util.h" #include "string.h" diff --git a/ptrace.c b/ptrace.c index 66de9f408..01409186b 100644 --- a/ptrace.c +++ b/ptrace.c @@ -15,7 +15,7 @@ #include "crtools.h" #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "util.h" #include "ptrace.h" #include "proc_parse.h" diff --git a/signalfd.c b/signalfd.c index 578fec0de..91c14d6c3 100644 --- a/signalfd.c +++ b/signalfd.c @@ -3,7 +3,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "signalfd.h" #include "proc_parse.h" #include "crtools.h" diff --git a/sk-inet.c b/sk-inet.c index 19a413b6c..25581baf0 100644 --- a/sk-inet.c +++ b/sk-inet.c @@ -9,7 +9,7 @@ #include #include -#include "types.h" +#include "asm/types.h" #include "libnetlink.h" #include "crtools.h" #include "inet_diag.h" diff --git a/sk-packet.c b/sk-packet.c index a82825ad1..0e85d36a7 100644 --- a/sk-packet.c +++ b/sk-packet.c @@ -5,7 +5,7 @@ #include #include #include "crtools.h" -#include "types.h" +#include "asm/types.h" #include "files.h" #include "sockets.h" #include "libnetlink.h" diff --git a/sk-queue.c b/sk-queue.c index b96daaae2..4f9a743c9 100644 --- a/sk-queue.c +++ b/sk-queue.c @@ -10,7 +10,7 @@ #include #include -#include "types.h" +#include "asm/types.h" #include "list.h" #include "image.h" #include "crtools.h" diff --git a/sk-tcp.c b/sk-tcp.c index c7c2c1560..ebf98154c 100644 --- a/sk-tcp.c +++ b/sk-tcp.c @@ -10,7 +10,7 @@ #include "util.h" #include "list.h" #include "log.h" -#include "types.h" +#include "asm/types.h" #include "files.h" #include "sockets.h" #include "files.h" diff --git a/sk-unix.c b/sk-unix.c index b2081fb72..c6ec844ad 100644 --- a/sk-unix.c +++ b/sk-unix.c @@ -8,7 +8,7 @@ #include #include -#include "types.h" +#include "asm/types.h" #include "libnetlink.h" #include "crtools.h" #include "unix_diag.h" diff --git a/sysctl.c b/sysctl.c index a7bb6e3a2..92fc15304 100644 --- a/sysctl.c +++ b/sysctl.c @@ -4,7 +4,7 @@ #include #include -#include "types.h" +#include "asm/types.h" #include "sysctl.h" #include "util.h" diff --git a/tty.c b/tty.c index f5f10f9b4..e08405976 100644 --- a/tty.c +++ b/tty.c @@ -13,7 +13,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "syscall.h" #include "files.h" diff --git a/util-net.c b/util-net.c index 0feae03c6..3aace3df4 100644 --- a/util-net.c +++ b/util-net.c @@ -4,8 +4,8 @@ #include #include "compiler.h" -#include "memcpy_64.h" -#include "types.h" +#include "asm/memcpy_64.h" +#include "asm/types.h" #include "syscall.h" #include "util-net.h" diff --git a/util.c b/util.c index 59ed831b7..90c82f7d1 100644 --- a/util.c +++ b/util.c @@ -30,7 +30,7 @@ #include #include "compiler.h" -#include "types.h" +#include "asm/types.h" #include "list.h" #include "util.h"