Hide asm/types.h from sources

travis-ci: success for criu: Remove asm/ includes from non-arch sources
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>

criu/bfd.c

@@ -7,6 +7,7 @@
 #include <sys/uio.h>
 #include <errno.h>
 
+#include "asm/int.h"
 #include "bug.h"
 #include "log.h"
 #include "bfd.h"

criu/cgroup-props.c

@@ -8,6 +8,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include "asm/int.h"
 #include "compiler.h"
 #include "cgroup-props.h"
 #include "cr_options.h"

criu/cgroup.c

@@ -19,7 +19,6 @@
 #include "namespaces.h"
 #include "seize.h"
 #include "syscall-types.h"
-#include "parasite.h"
 #include "protobuf.h"
 #include "images/core.pb-c.h"
 #include "images/cgroup.pb-c.h"

criu/cr-check.c

@@ -23,6 +23,7 @@
 #include <linux/aio_abi.h>
 #include <sys/mount.h>
 
+#include "types.h"
 #include "fdinfo.h"
 #include "sockets.h"
 #include "crtools.h"

criu/cr-dump.c

@@ -22,6 +22,7 @@
 #include <sched.h>
 #include <sys/resource.h>
 
+#include "types.h"
 #include "protobuf.h"
 #include "images/fdinfo.pb-c.h"
 #include "images/fs.pb-c.h"
@@ -32,7 +33,6 @@
 #include "images/rlimit.pb-c.h"
 #include "images/siginfo.pb-c.h"
 
-#include "asm/types.h"
 #include "common/list.h"
 #include "imgset.h"
 #include "file-ids.h"

criu/cr-restore.c

@@ -19,14 +19,13 @@
 #include <sys/shm.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
-
 #include <sched.h>
 
 #include <sys/sendfile.h>
 
+#include "types.h"
 #include "ptrace.h"
 #include "compiler.h"
-#include "asm/types.h"
 #include "asm/restorer.h"
 
 #include "cr_options.h"

criu/cr-service.c

@@ -15,6 +15,7 @@
 #include <arpa/inet.h>
 #include <sched.h>
 
+#include "asm/int.h"
 #include "crtools.h"
 #include "cr_options.h"
 #include "external.h"

criu/crtools.c

@@ -19,8 +19,7 @@
 
 #include <dlfcn.h>
 
-#include "asm/types.h"
-
+#include "asm/int.h"
 #include "compiler.h"
 #include "crtools.h"
 #include "cr_options.h"

criu/eventfd.c

@@ -13,7 +13,6 @@
 #include <sys/eventfd.h>
 
 #include "compiler.h"
-#include "asm/types.h"
 #include "imgset.h"
 #include "eventfd.h"
 #include "fdinfo.h"

criu/eventpoll.c

@@ -14,7 +14,6 @@
 
 #include "crtools.h"
 #include "compiler.h"
-#include "asm/types.h"
 #include "imgset.h"
 #include "rst_info.h"
 #include "eventpoll.h"

criu/file-ids.c

@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "asm/types.h"
+#include "asm/int.h"
 #include "file-ids.h"
 #include "rbtree.h"
 #include "kcmp-ids.h"

criu/file-lock.c

@@ -16,8 +16,6 @@
 #include "proc_parse.h"
 #include "servicefd.h"
 #include "file-lock.h"
-#include "parasite.h"
-#include "parasite-syscall.h"
 
 struct file_lock_rst {
 	FileLockEntry *fle;

criu/files.c

@@ -13,6 +13,7 @@
 #include <sys/un.h>
 #include <stdlib.h>
 
+#include "types.h"
 #include "files.h"
 #include "file-ids.h"
 #include "files-reg.h"
@@ -40,7 +41,6 @@
 #include "fdinfo.h"
 #include "cr_options.h"
 #include "autofs.h"
-
 #include "parasite.h"
 #include "parasite-syscall.h"
 

criu/filesystems.c

@@ -4,7 +4,7 @@
 #include <fcntl.h>
 #include <sys/mount.h>
 
-#include "asm/types.h"
+#include "asm/int.h"
 #include "compiler.h"
 #include "xmalloc.h"
 #include "cr_options.h"

criu/fsnotify.c

@@ -23,7 +23,6 @@
 #include <sys/fanotify.h>
 
 #include "compiler.h"
-#include "asm/types.h"
 #include "imgset.h"
 #include "fsnotify.h"
 #include "fdinfo.h"

criu/include/crtools.h

@@ -4,7 +4,6 @@
 #include <sys/types.h>
 
 #include "common/list.h"
-#include "asm/types.h"
 #include "servicefd.h"
 
 #include "images/inventory.pb-c.h"

criu/include/file-ids.h

@@ -2,7 +2,6 @@
 #define __CR_FILE_IDS_H__
 
 #include "compiler.h"
-#include "asm/types.h"
 #include "rbtree.h"
 
 #include "images/fdinfo.pb-c.h"

criu/include/files-reg.h

@@ -1,7 +1,6 @@
 #ifndef __CR_FILES_REG_H__
 #define __CR_FILES_REG_H__
 
-#include "asm/types.h"
 #include "files.h"
 
 #include "images/regfile.pb-c.h"

criu/include/files.h

@@ -4,7 +4,6 @@
 #include <sys/stat.h>
 
 #include "compiler.h"
-#include "asm/types.h"
 #include "fcntl.h"
 #include "lock.h"
 #include "common/list.h"

criu/include/fsnotify.h

@@ -1,7 +1,6 @@
 #ifndef __CR_FSNOTIFY_H__
 #define __CR_FSNOTIFY_H__
 
-#include "asm/types.h"
 #include "files.h"
 
 #include "protobuf.h"

criu/include/kerndat.h

@@ -1,8 +1,6 @@
 #ifndef __CR_KERNDAT_H__
 #define __CR_KERNDAT_H__
 
-#include "asm/types.h"
-
 struct stat;
 
 /*

criu/include/lock.h

@@ -6,7 +6,6 @@
 #include <limits.h>
 #include <errno.h>
 
-#include "asm/types.h"
 #include "asm/atomic.h"
 #include "bug.h"
 

criu/include/mount.h

@@ -3,7 +3,6 @@
 
 #include <sys/types.h>
 
-#include "asm/types.h"
 #include "common/list.h"
 
 struct proc_mountinfo;

criu/include/parasite-syscall.h

@@ -1,7 +1,6 @@
 #ifndef __CR_PARASITE_SYSCALL_H__
 #define __CR_PARASITE_SYSCALL_H__
 
-#include "asm/types.h"
 #include "pid.h"
 #include "common/list.h"
 #include "config.h"

criu/include/proc_parse.h

@@ -2,7 +2,6 @@
 #define __CR_PROC_PARSE_H__
 
 #include <sys/types.h>
-#include "asm/types.h"
 
 #include "images/seccomp.pb-c.h"
 

criu/include/protobuf.h

@@ -3,7 +3,6 @@
 
 #include "protobuf-desc.h"
 
-#include "asm/types.h"
 #include "compiler.h"
 #include "util.h"
 

criu/include/rbtree.h

@@ -8,7 +8,6 @@
 #include <stddef.h>
 
 #include "compiler.h"
-#include "asm/types.h"
 
 #define	RB_RED		0
 #define	RB_BLACK	1

criu/include/restorer.h

@@ -6,7 +6,6 @@
 #include <sys/resource.h>
 
 #include "compiler.h"
-#include "asm/types.h"
 #include "asm/fpu.h"
 #include "lock.h"
 #include "util.h"

criu/include/sigframe.h

@@ -5,7 +5,6 @@
 #ifndef __CR_SIGFRAME_H__
 #define __CR_SIGFRAME_H__
 
-#include "asm/types.h"
 #include "images/core.pb-c.h"
 
 struct rt_sigframe;

criu/include/signal.h

@@ -1,6 +1,5 @@
 #ifndef __CR_SIGNAL_H__
 #define __CR_SIGNAL_H__
-#include "asm/types.h"
 
 static inline void ksigfillset(k_rtsigset_t *set)
 {

criu/include/sockets.h

@@ -4,8 +4,6 @@
 #include <stdbool.h>
 #include <sys/socket.h>
 
-#include "asm/types.h"
-
 #include "protobuf.h"
 #include "images/sk-opts.pb-c.h"
 

criu/include/syscall-types.h

@@ -14,8 +14,6 @@
 #include <time.h>
 #include <fcntl.h>
 
-#include "asm/types.h"
-
 struct cap_header {
 	u32 version;
 	int pid;

criu/include/types.h

@@ -0,0 +1,4 @@
+#ifndef __CR_INC_TYPES_H__
+#define __CR_INC_TYPES_H__
+#include "asm/types.h"
+#endif

criu/include/unix_diag.h

@@ -1,8 +1,6 @@
 #ifndef __CR_UNIX_DIAG_H__
 #define __CR_UNIX_DIAG_H__
 
-#include "asm/types.h"
-
 struct unix_diag_req {
 	u8	sdiag_family;
 	u8	sdiag_protocol;

criu/include/util-pie.h

@@ -4,8 +4,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "asm/types.h"
-
 #define UNIX_PATH_MAX (sizeof(struct sockaddr_un) - \
 			(size_t)((struct sockaddr_un *) 0)->sun_path)
 

criu/include/util.h

@@ -13,7 +13,6 @@
 #include <dirent.h>
 
 #include "compiler.h"
-#include "asm/types.h"
 #include "xmalloc.h"
 #include "bug.h"
 #include "log.h"

criu/include/vma.h

@@ -1,7 +1,6 @@
 #ifndef __CR_VMA_H__
 #define __CR_VMA_H__
 
-#include "asm/types.h"
 #include "image.h"
 #include "common/list.h"
 

criu/ipc_ns.c

@@ -8,6 +8,7 @@
 #include <sys/shm.h>
 #include <sched.h>
 
+#include "asm/int.h"
 #include "util.h"
 #include "cr_options.h"
 #include "imgset.h"

criu/irmap.c

@@ -16,6 +16,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "asm/int.h"
 #include "xmalloc.h"
 #include "irmap.h"
 #include "mount.h"

criu/kcmp-ids.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <sys/syscall.h>
 
-#include "asm/types.h"
+#include "asm/int.h"
 #include "rbtree.h"
 #include "util.h"
 #include "kcmp-ids.h"

criu/kerndat.c

@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <sys/syscall.h>
 
+#include "asm/int.h"
 #include "log.h"
 #include "bug.h"
 #include "kerndat.h"
@@ -15,7 +16,6 @@
 #include "mem.h"
 #include "compiler.h"
 #include "sysctl.h"
-#include "asm/types.h"
 #include "cr_options.h"
 #include "util.h"
 #include "lsm.h"

criu/libnetlink.c

@@ -7,6 +7,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "asm/int.h"
 #include "libnetlink.h"
 #include "util.h"
 

criu/log.c

@@ -12,8 +12,9 @@
 
 #include <fcntl.h>
 
+#include "asm/int.h"
+#include "asm/page.h"
 #include "compiler.h"
-#include "asm/types.h"
 #include "util.h"
 #include "cr_options.h"
 #include "servicefd.h"

criu/lsm.c

@@ -5,6 +5,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "asm/int.h"
 #include "config.h"
 #include "pstree.h"
 #include "util.h"

criu/mem.c

@@ -4,6 +4,7 @@
 #include <errno.h>
 #include <fcntl.h>
 
+#include "types.h"
 #include "cr_options.h"
 #include "servicefd.h"
 #include "mem.h"

criu/mount.c

@@ -11,8 +11,8 @@
 #include <sys/wait.h>
 #include <sched.h>
 
+#include "asm/int.h"
 #include "cr_options.h"
-#include "asm/types.h"
 #include "util.h"
 #include "util-pie.h"
 #include "log.h"

criu/namespaces.c

@@ -14,6 +14,7 @@
 #include <limits.h>
 #include <errno.h>
 
+#include "asm/page.h"
 #include "rst-malloc.h"
 #include "cr_options.h"
 #include "imgset.h"

criu/netfilter.c

@@ -5,7 +5,7 @@
 #include <sys/wait.h>
 #include <stdlib.h>
 
-#include "asm/types.h"
+#include "asm/int.h"
 #include "util.h"
 #include "common/list.h"
 #include "files.h"

criu/page-pipe.c

@@ -4,6 +4,8 @@
 #undef LOG_PREFIX
 #define LOG_PREFIX "page-pipe: "
 
+#include "asm/int.h"
+#include "asm/page.h"
 #include "config.h"
 #include "util.h"
 #include "page-pipe.h"

criu/page-xfer.c

@@ -8,6 +8,7 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 
+#include "types.h"
 #include "cr_options.h"
 #include "servicefd.h"
 #include "image.h"

criu/pagemap.c

@@ -3,6 +3,7 @@
 #include <unistd.h>
 #include <linux/falloc.h>
 
+#include "types.h"
 #include "image.h"
 #include "cr_options.h"
 #include "servicefd.h"

criu/parasite-syscall.c

@@ -5,6 +5,7 @@
 #include <sys/wait.h>
 #include <sys/mman.h>
 
+#include "types.h"
 #include "protobuf.h"
 #include "images/sa.pb-c.h"
 #include "images/timer.pb-c.h"

criu/path.c

@@ -1,6 +1,8 @@
 #include <string.h>
 #include <stdio.h>
+#include <stdbool.h>
 
+#include "asm/int.h"
 #include "mount.h"
 #include "path.h"
 #include "bug.h"

criu/pie/parasite-vdso.c

@@ -10,7 +10,6 @@
 #include <sys/mman.h>
 
 #include "asm/string.h"
-#include "asm/types.h"
 
 #include "syscall.h"
 #include "image.h"

criu/pie/parasite.c

@@ -8,6 +8,7 @@
 #include <sys/ioctl.h>
 
 #include "syscall.h"
+#include "types.h"
 #include "parasite.h"
 #include "config.h"
 #include "fcntl.h"
@@ -20,7 +21,6 @@
 
 #include <string.h>
 
-#include "asm/types.h"
 #include "asm/parasite.h"
 #include "asm/restorer.h"
 

criu/pie/restorer.c

@@ -19,7 +19,6 @@
 
 #include "compiler.h"
 #include "asm/string.h"
-#include "asm/types.h"
 #include "syscall.h"
 #include "signal.h"
 #include "config.h"

criu/pie/util-fd.c

@@ -1,13 +1,13 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/mount.h>
-
+#include <stdbool.h>
 #include <errno.h>
 
+#include "asm/int.h"
 #include "compiler.h"
 #include "log.h"
 #include "asm/string.h"
-#include "asm/types.h"
 
 #ifdef CR_NOGLIBC
 # include "syscall.h"

criu/pie/util-vdso.c

@@ -11,7 +11,6 @@
 #include <sys/mman.h>
 
 #include "asm/string.h"
-#include "asm/types.h"
 
 #include "image.h"
 #include "util-vdso.h"

criu/pie/util.c

@@ -3,10 +3,11 @@
 #include <sys/mount.h>
 #include <unistd.h>
 #include <errno.h>
+#include <stdbool.h>
 
+#include "asm/int.h"
 #include "compiler.h"
 #include "asm/string.h"
-#include "asm/types.h"
 #include "fcntl.h"
 #include "log.h"
 #include "util-pie.h"

criu/proc_parse.c

@@ -10,7 +10,7 @@
 #include <ctype.h>
 #include <linux/fs.h>
 
-#include "asm/types.h"
+#include "asm/int.h"
 #include "common/list.h"
 #include "util.h"
 #include "mount.h"

criu/protobuf-desc.c

@@ -8,8 +8,6 @@
 #include <arpa/inet.h>
 #include <ctype.h>
 
-#include "asm/types.h"
-
 #include "compiler.h"
 #include "log.h"
 

criu/protobuf.c

@@ -11,7 +11,6 @@
 #include "image.h"
 #include "servicefd.h"
 #include "compiler.h"
-#include "asm/types.h"
 #include "log.h"
 #include "rst-malloc.h"
 #include "string.h"

criu/pstree.c

@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <sched.h>
 
+#include "types.h"
 #include "cr_options.h"
 #include "pstree.h"
 #include "rst-malloc.h"

criu/ptrace.c

@@ -14,8 +14,8 @@
 #include <sys/resource.h>
 #include <sys/wait.h>
 
+#include "asm/int.h"
 #include "compiler.h"
-#include "asm/types.h"
 #include "util.h"
 #include "ptrace.h"
 #include "pid.h"

criu/rst-malloc.c

@@ -2,9 +2,9 @@
 #include <stdbool.h>
 #include <sys/mman.h>
 
+#include "asm/page.h"
 #include "rst-malloc.h"
 #include "bug.h"
-#include "asm/types.h"
 
 struct rst_mem_type_s {
 	bool remapable;

criu/seize.c

@@ -9,6 +9,7 @@
 #include <sys/wait.h>
 #include <time.h>
 
+#include "asm/int.h"
 #include "compiler.h"
 #include "cr_options.h"
 #include "cr-errno.h"

criu/shmem.c

@@ -19,6 +19,7 @@
 #include "syscall-codes.h"
 #include "asm/bitops.h"
 #include "criu-log.h"
+#include "asm/page.h"
 
 #include "protobuf.h"
 #include "images/pagemap.pb-c.h"

criu/signalfd.c

@@ -3,7 +3,6 @@
 #include <sys/signalfd.h>
 
 #include "compiler.h"
-#include "asm/types.h"
 #include "signalfd.h"
 #include "fdinfo.h"
 #include "imgset.h"

criu/sk-inet.c

@@ -11,7 +11,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "asm/types.h"
 #include "libnetlink.h"
 #include "cr_options.h"
 #include "imgset.h"

criu/sk-packet.c

@@ -5,7 +5,6 @@
 #include <libnl3/netlink/msg.h>
 #include <unistd.h>
 #include <string.h>
-#include "asm/types.h"
 #include "imgset.h"
 #include "files.h"
 #include "sockets.h"

criu/sk-queue.c

@@ -10,7 +10,6 @@
 #include <sys/socket.h>
 #include <sys/sendfile.h>
 
-#include "asm/types.h"
 #include "common/list.h"
 #include "imgset.h"
 #include "image.h"

criu/sk-tcp.c

@@ -8,11 +8,11 @@
 #include <sched.h>
 #include <netinet/in.h>
 
+#include "asm/int.h"
 #include "cr_options.h"
 #include "util.h"
 #include "common/list.h"
 #include "log.h"
-#include "asm/types.h"
 #include "files.h"
 #include "sockets.h"
 #include "sk-inet.h"

criu/sk-unix.c

@@ -10,7 +10,6 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 
-#include "asm/types.h"
 #include "libnetlink.h"
 #include "cr_options.h"
 #include "imgset.h"

criu/sockets.c

@@ -9,6 +9,8 @@
 #include <string.h>
 #include <netinet/in.h>
 
+#include "asm/int.h"
+#include "asm/bitops.h"
 #include "libnetlink.h"
 #include "sockets.h"
 #include "unix_diag.h"

criu/sysctl.c

@@ -7,7 +7,6 @@
 #include <sys/wait.h>
 #include <sched.h>
 
-#include "asm/types.h"
 #include "namespaces.h"
 #include "sysctl.h"
 #include "util.h"

criu/timerfd.c

@@ -5,6 +5,7 @@
 #include <sys/timerfd.h>
 #include <sys/ioctl.h>
 
+#include "asm/int.h"
 #include "protobuf.h"
 #include "images/timerfd.pb-c.h"
 

criu/tty.c

@@ -12,9 +12,8 @@
 #include <termios.h>
 #include <linux/major.h>
 
+#include "types.h"
 #include "compiler.h"
-#include "asm/types.h"
-
 #include "crtools.h"
 #include "files.h"
 #include "cr_options.h"

criu/util.c

@@ -35,8 +35,10 @@
 #include <sched.h>
 #include <ctype.h>
 
+#include "asm/int.h"
+#include "asm/bitops.h"
+#include "asm/page.h"
 #include "compiler.h"
-#include "asm/types.h"
 #include "common/list.h"
 #include "util.h"
 #include "rst-malloc.h"

criu/uts_ns.c

@@ -4,6 +4,7 @@
 #include <string.h>
 #include <sched.h>
 
+#include "asm/int.h"
 #include "util.h"
 #include "namespaces.h"
 #include "sysctl.h"

criu/vdso.c

@@ -9,7 +9,6 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "asm/types.h"
 #include "asm/parasite-syscall.h"
 
 #include "parasite-syscall.h"