From 96c7cb7661a76c3da585e84cd42ed75194673161 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 20 Oct 2016 23:34:51 +0300 Subject: [PATCH] Hide asm/types.h from sources travis-ci: success for criu: Remove asm/ includes from non-arch sources Signed-off-by: Pavel Emelyanov --- criu/bfd.c | 1 + criu/cgroup-props.c | 1 + criu/cgroup.c | 1 - criu/cr-check.c | 1 + criu/cr-dump.c | 2 +- criu/cr-restore.c | 3 +-- criu/cr-service.c | 1 + criu/crtools.c | 3 +-- criu/eventfd.c | 1 - criu/eventpoll.c | 1 - criu/file-ids.c | 2 +- criu/file-lock.c | 2 -- criu/files.c | 2 +- criu/filesystems.c | 2 +- criu/fsnotify.c | 1 - criu/include/crtools.h | 1 - criu/include/file-ids.h | 1 - criu/include/files-reg.h | 1 - criu/include/files.h | 1 - criu/include/fsnotify.h | 1 - criu/include/kerndat.h | 2 -- criu/include/lock.h | 1 - criu/include/mount.h | 1 - criu/include/parasite-syscall.h | 1 - criu/include/proc_parse.h | 1 - criu/include/protobuf.h | 1 - criu/include/rbtree.h | 1 - criu/include/restorer.h | 1 - criu/include/sigframe.h | 1 - criu/include/signal.h | 1 - criu/include/sockets.h | 2 -- criu/include/syscall-types.h | 2 -- criu/include/types.h | 4 ++++ criu/include/unix_diag.h | 2 -- criu/include/util-pie.h | 2 -- criu/include/util.h | 1 - criu/include/vma.h | 1 - criu/ipc_ns.c | 1 + criu/irmap.c | 1 + criu/kcmp-ids.c | 2 +- criu/kerndat.c | 2 +- criu/libnetlink.c | 1 + criu/log.c | 3 ++- criu/lsm.c | 1 + criu/mem.c | 1 + criu/mount.c | 2 +- criu/namespaces.c | 1 + criu/netfilter.c | 2 +- criu/page-pipe.c | 2 ++ criu/page-xfer.c | 1 + criu/pagemap.c | 1 + criu/parasite-syscall.c | 1 + criu/path.c | 2 ++ criu/pie/parasite-vdso.c | 1 - criu/pie/parasite.c | 2 +- criu/pie/restorer.c | 1 - criu/pie/util-fd.c | 4 ++-- criu/pie/util-vdso.c | 1 - criu/pie/util.c | 3 ++- criu/proc_parse.c | 2 +- criu/protobuf-desc.c | 2 -- criu/protobuf.c | 1 - criu/pstree.c | 1 + criu/ptrace.c | 2 +- criu/rst-malloc.c | 2 +- criu/seize.c | 1 + criu/shmem.c | 1 + criu/signalfd.c | 1 - criu/sk-inet.c | 1 - criu/sk-packet.c | 1 - criu/sk-queue.c | 1 - criu/sk-tcp.c | 2 +- criu/sk-unix.c | 1 - criu/sockets.c | 2 ++ criu/sysctl.c | 1 - criu/timerfd.c | 1 + criu/tty.c | 3 +-- criu/util.c | 4 +++- criu/uts_ns.c | 1 + criu/vdso.c | 1 - 80 files changed, 53 insertions(+), 69 deletions(-) create mode 100644 criu/include/types.h diff --git a/criu/bfd.c b/criu/bfd.c index a65b5531b..a5fcace19 100644 --- a/criu/bfd.c +++ b/criu/bfd.c @@ -7,6 +7,7 @@ #include #include +#include "asm/int.h" #include "bug.h" #include "log.h" #include "bfd.h" diff --git a/criu/cgroup-props.c b/criu/cgroup-props.c index 174b98769..963b16a94 100644 --- a/criu/cgroup-props.c +++ b/criu/cgroup-props.c @@ -8,6 +8,7 @@ #include #include +#include "asm/int.h" #include "compiler.h" #include "cgroup-props.h" #include "cr_options.h" diff --git a/criu/cgroup.c b/criu/cgroup.c index 00799be81..f543627ee 100644 --- a/criu/cgroup.c +++ b/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" diff --git a/criu/cr-check.c b/criu/cr-check.c index bb4d97807..944b36d6b 100644 --- a/criu/cr-check.c +++ b/criu/cr-check.c @@ -23,6 +23,7 @@ #include #include +#include "types.h" #include "fdinfo.h" #include "sockets.h" #include "crtools.h" diff --git a/criu/cr-dump.c b/criu/cr-dump.c index 4e64ff818..6a43eaaff 100644 --- a/criu/cr-dump.c +++ b/criu/cr-dump.c @@ -22,6 +22,7 @@ #include #include +#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" diff --git a/criu/cr-restore.c b/criu/cr-restore.c index 589d46630..bacc833dc 100644 --- a/criu/cr-restore.c +++ b/criu/cr-restore.c @@ -19,14 +19,13 @@ #include #include #include - #include #include +#include "types.h" #include "ptrace.h" #include "compiler.h" -#include "asm/types.h" #include "asm/restorer.h" #include "cr_options.h" diff --git a/criu/cr-service.c b/criu/cr-service.c index 6f1f70e0c..bf52143a3 100644 --- a/criu/cr-service.c +++ b/criu/cr-service.c @@ -15,6 +15,7 @@ #include #include +#include "asm/int.h" #include "crtools.h" #include "cr_options.h" #include "external.h" diff --git a/criu/crtools.c b/criu/crtools.c index 5322fc33f..e91cb3fea 100644 --- a/criu/crtools.c +++ b/criu/crtools.c @@ -19,8 +19,7 @@ #include -#include "asm/types.h" - +#include "asm/int.h" #include "compiler.h" #include "crtools.h" #include "cr_options.h" diff --git a/criu/eventfd.c b/criu/eventfd.c index f12088671..6426de006 100644 --- a/criu/eventfd.c +++ b/criu/eventfd.c @@ -13,7 +13,6 @@ #include #include "compiler.h" -#include "asm/types.h" #include "imgset.h" #include "eventfd.h" #include "fdinfo.h" diff --git a/criu/eventpoll.c b/criu/eventpoll.c index db1e2a222..bb2efbd06 100644 --- a/criu/eventpoll.c +++ b/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" diff --git a/criu/file-ids.c b/criu/file-ids.c index f23924a05..a20522951 100644 --- a/criu/file-ids.c +++ b/criu/file-ids.c @@ -9,7 +9,7 @@ #include #include -#include "asm/types.h" +#include "asm/int.h" #include "file-ids.h" #include "rbtree.h" #include "kcmp-ids.h" diff --git a/criu/file-lock.c b/criu/file-lock.c index e08eda7e1..43ffdc504 100644 --- a/criu/file-lock.c +++ b/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; diff --git a/criu/files.c b/criu/files.c index b5625f5d0..37771a383 100644 --- a/criu/files.c +++ b/criu/files.c @@ -13,6 +13,7 @@ #include #include +#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" diff --git a/criu/filesystems.c b/criu/filesystems.c index d413332e8..75a698000 100644 --- a/criu/filesystems.c +++ b/criu/filesystems.c @@ -4,7 +4,7 @@ #include #include -#include "asm/types.h" +#include "asm/int.h" #include "compiler.h" #include "xmalloc.h" #include "cr_options.h" diff --git a/criu/fsnotify.c b/criu/fsnotify.c index a18c76379..74c704c9e 100644 --- a/criu/fsnotify.c +++ b/criu/fsnotify.c @@ -23,7 +23,6 @@ #include #include "compiler.h" -#include "asm/types.h" #include "imgset.h" #include "fsnotify.h" #include "fdinfo.h" diff --git a/criu/include/crtools.h b/criu/include/crtools.h index a8ca2a3e3..ef0129ba0 100644 --- a/criu/include/crtools.h +++ b/criu/include/crtools.h @@ -4,7 +4,6 @@ #include #include "common/list.h" -#include "asm/types.h" #include "servicefd.h" #include "images/inventory.pb-c.h" diff --git a/criu/include/file-ids.h b/criu/include/file-ids.h index 2673543bd..e6c15c4d9 100644 --- a/criu/include/file-ids.h +++ b/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" diff --git a/criu/include/files-reg.h b/criu/include/files-reg.h index 6cc245475..7023fff2c 100644 --- a/criu/include/files-reg.h +++ b/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" diff --git a/criu/include/files.h b/criu/include/files.h index 2ea7116d5..b8f670aa6 100644 --- a/criu/include/files.h +++ b/criu/include/files.h @@ -4,7 +4,6 @@ #include #include "compiler.h" -#include "asm/types.h" #include "fcntl.h" #include "lock.h" #include "common/list.h" diff --git a/criu/include/fsnotify.h b/criu/include/fsnotify.h index 522fe3f6f..adc02034c 100644 --- a/criu/include/fsnotify.h +++ b/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" diff --git a/criu/include/kerndat.h b/criu/include/kerndat.h index 1353b9e6e..c90ce9645 100644 --- a/criu/include/kerndat.h +++ b/criu/include/kerndat.h @@ -1,8 +1,6 @@ #ifndef __CR_KERNDAT_H__ #define __CR_KERNDAT_H__ -#include "asm/types.h" - struct stat; /* diff --git a/criu/include/lock.h b/criu/include/lock.h index 8a765338b..d9c5211ba 100644 --- a/criu/include/lock.h +++ b/criu/include/lock.h @@ -6,7 +6,6 @@ #include #include -#include "asm/types.h" #include "asm/atomic.h" #include "bug.h" diff --git a/criu/include/mount.h b/criu/include/mount.h index 43193ee47..e09935575 100644 --- a/criu/include/mount.h +++ b/criu/include/mount.h @@ -3,7 +3,6 @@ #include -#include "asm/types.h" #include "common/list.h" struct proc_mountinfo; diff --git a/criu/include/parasite-syscall.h b/criu/include/parasite-syscall.h index edc97ff21..ef45f28ce 100644 --- a/criu/include/parasite-syscall.h +++ b/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" diff --git a/criu/include/proc_parse.h b/criu/include/proc_parse.h index ac7a780ba..d1eed10ea 100644 --- a/criu/include/proc_parse.h +++ b/criu/include/proc_parse.h @@ -2,7 +2,6 @@ #define __CR_PROC_PARSE_H__ #include -#include "asm/types.h" #include "images/seccomp.pb-c.h" diff --git a/criu/include/protobuf.h b/criu/include/protobuf.h index 821fb028e..c2f685075 100644 --- a/criu/include/protobuf.h +++ b/criu/include/protobuf.h @@ -3,7 +3,6 @@ #include "protobuf-desc.h" -#include "asm/types.h" #include "compiler.h" #include "util.h" diff --git a/criu/include/rbtree.h b/criu/include/rbtree.h index f60821032..2cde684cc 100644 --- a/criu/include/rbtree.h +++ b/criu/include/rbtree.h @@ -8,7 +8,6 @@ #include #include "compiler.h" -#include "asm/types.h" #define RB_RED 0 #define RB_BLACK 1 diff --git a/criu/include/restorer.h b/criu/include/restorer.h index d386cd2db..78b0ab091 100644 --- a/criu/include/restorer.h +++ b/criu/include/restorer.h @@ -6,7 +6,6 @@ #include #include "compiler.h" -#include "asm/types.h" #include "asm/fpu.h" #include "lock.h" #include "util.h" diff --git a/criu/include/sigframe.h b/criu/include/sigframe.h index 1bb0fb9ca..cee64e226 100644 --- a/criu/include/sigframe.h +++ b/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; diff --git a/criu/include/signal.h b/criu/include/signal.h index 618065886..788b8e2b4 100644 --- a/criu/include/signal.h +++ b/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) { diff --git a/criu/include/sockets.h b/criu/include/sockets.h index 5df567677..81e3790d3 100644 --- a/criu/include/sockets.h +++ b/criu/include/sockets.h @@ -4,8 +4,6 @@ #include #include -#include "asm/types.h" - #include "protobuf.h" #include "images/sk-opts.pb-c.h" diff --git a/criu/include/syscall-types.h b/criu/include/syscall-types.h index db0dbc09b..b7c190433 100644 --- a/criu/include/syscall-types.h +++ b/criu/include/syscall-types.h @@ -14,8 +14,6 @@ #include #include -#include "asm/types.h" - struct cap_header { u32 version; int pid; diff --git a/criu/include/types.h b/criu/include/types.h new file mode 100644 index 000000000..c55993a2a --- /dev/null +++ b/criu/include/types.h @@ -0,0 +1,4 @@ +#ifndef __CR_INC_TYPES_H__ +#define __CR_INC_TYPES_H__ +#include "asm/types.h" +#endif diff --git a/criu/include/unix_diag.h b/criu/include/unix_diag.h index 3f2468330..d88d52fd3 100644 --- a/criu/include/unix_diag.h +++ b/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; diff --git a/criu/include/util-pie.h b/criu/include/util-pie.h index cbaed4224..a14353361 100644 --- a/criu/include/util-pie.h +++ b/criu/include/util-pie.h @@ -4,8 +4,6 @@ #include #include -#include "asm/types.h" - #define UNIX_PATH_MAX (sizeof(struct sockaddr_un) - \ (size_t)((struct sockaddr_un *) 0)->sun_path) diff --git a/criu/include/util.h b/criu/include/util.h index 5b7cad113..9c1cd6c37 100644 --- a/criu/include/util.h +++ b/criu/include/util.h @@ -13,7 +13,6 @@ #include #include "compiler.h" -#include "asm/types.h" #include "xmalloc.h" #include "bug.h" #include "log.h" diff --git a/criu/include/vma.h b/criu/include/vma.h index c975f7472..795f3a0ca 100644 --- a/criu/include/vma.h +++ b/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" diff --git a/criu/ipc_ns.c b/criu/ipc_ns.c index c9468d8ce..71ccd9419 100644 --- a/criu/ipc_ns.c +++ b/criu/ipc_ns.c @@ -8,6 +8,7 @@ #include #include +#include "asm/int.h" #include "util.h" #include "cr_options.h" #include "imgset.h" diff --git a/criu/irmap.c b/criu/irmap.c index a69776c9f..3da658f97 100644 --- a/criu/irmap.c +++ b/criu/irmap.c @@ -16,6 +16,7 @@ #include #include +#include "asm/int.h" #include "xmalloc.h" #include "irmap.h" #include "mount.h" diff --git a/criu/kcmp-ids.c b/criu/kcmp-ids.c index 853879fe0..7f7c4cc36 100644 --- a/criu/kcmp-ids.c +++ b/criu/kcmp-ids.c @@ -2,7 +2,7 @@ #include #include -#include "asm/types.h" +#include "asm/int.h" #include "rbtree.h" #include "util.h" #include "kcmp-ids.h" diff --git a/criu/kerndat.c b/criu/kerndat.c index 6e849199d..1841d5dad 100644 --- a/criu/kerndat.c +++ b/criu/kerndat.c @@ -8,6 +8,7 @@ #include #include +#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" diff --git a/criu/libnetlink.c b/criu/libnetlink.c index 5f69a3d66..5a91e6867 100644 --- a/criu/libnetlink.c +++ b/criu/libnetlink.c @@ -7,6 +7,7 @@ #include #include +#include "asm/int.h" #include "libnetlink.h" #include "util.h" diff --git a/criu/log.c b/criu/log.c index 6dd853074..6028304d5 100644 --- a/criu/log.c +++ b/criu/log.c @@ -12,8 +12,9 @@ #include +#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" diff --git a/criu/lsm.c b/criu/lsm.c index 330ffc454..7df241179 100644 --- a/criu/lsm.c +++ b/criu/lsm.c @@ -5,6 +5,7 @@ #include #include +#include "asm/int.h" #include "config.h" #include "pstree.h" #include "util.h" diff --git a/criu/mem.c b/criu/mem.c index ff807e0e6..451588d8d 100644 --- a/criu/mem.c +++ b/criu/mem.c @@ -4,6 +4,7 @@ #include #include +#include "types.h" #include "cr_options.h" #include "servicefd.h" #include "mem.h" diff --git a/criu/mount.c b/criu/mount.c index 4aea0c88a..471dde2c3 100644 --- a/criu/mount.c +++ b/criu/mount.c @@ -11,8 +11,8 @@ #include #include +#include "asm/int.h" #include "cr_options.h" -#include "asm/types.h" #include "util.h" #include "util-pie.h" #include "log.h" diff --git a/criu/namespaces.c b/criu/namespaces.c index b563c2562..53fd2bf30 100644 --- a/criu/namespaces.c +++ b/criu/namespaces.c @@ -14,6 +14,7 @@ #include #include +#include "asm/page.h" #include "rst-malloc.h" #include "cr_options.h" #include "imgset.h" diff --git a/criu/netfilter.c b/criu/netfilter.c index 72a2f184b..523f1095c 100644 --- a/criu/netfilter.c +++ b/criu/netfilter.c @@ -5,7 +5,7 @@ #include #include -#include "asm/types.h" +#include "asm/int.h" #include "util.h" #include "common/list.h" #include "files.h" diff --git a/criu/page-pipe.c b/criu/page-pipe.c index 3870bc66d..994797a31 100644 --- a/criu/page-pipe.c +++ b/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" diff --git a/criu/page-xfer.c b/criu/page-xfer.c index 60966d0b2..a91c47036 100644 --- a/criu/page-xfer.c +++ b/criu/page-xfer.c @@ -8,6 +8,7 @@ #include #include +#include "types.h" #include "cr_options.h" #include "servicefd.h" #include "image.h" diff --git a/criu/pagemap.c b/criu/pagemap.c index 6a0f61f05..18d09028e 100644 --- a/criu/pagemap.c +++ b/criu/pagemap.c @@ -3,6 +3,7 @@ #include #include +#include "types.h" #include "image.h" #include "cr_options.h" #include "servicefd.h" diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c index 2c0109a27..b51050b38 100644 --- a/criu/parasite-syscall.c +++ b/criu/parasite-syscall.c @@ -5,6 +5,7 @@ #include #include +#include "types.h" #include "protobuf.h" #include "images/sa.pb-c.h" #include "images/timer.pb-c.h" diff --git a/criu/path.c b/criu/path.c index 57773d547..5bbdfbfc8 100644 --- a/criu/path.c +++ b/criu/path.c @@ -1,6 +1,8 @@ #include #include +#include +#include "asm/int.h" #include "mount.h" #include "path.h" #include "bug.h" diff --git a/criu/pie/parasite-vdso.c b/criu/pie/parasite-vdso.c index 7f4e6a022..3acd0f40a 100644 --- a/criu/pie/parasite-vdso.c +++ b/criu/pie/parasite-vdso.c @@ -10,7 +10,6 @@ #include #include "asm/string.h" -#include "asm/types.h" #include "syscall.h" #include "image.h" diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c index 008576bb0..9343eaae6 100644 --- a/criu/pie/parasite.c +++ b/criu/pie/parasite.c @@ -8,6 +8,7 @@ #include #include "syscall.h" +#include "types.h" #include "parasite.h" #include "config.h" #include "fcntl.h" @@ -20,7 +21,6 @@ #include -#include "asm/types.h" #include "asm/parasite.h" #include "asm/restorer.h" diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c index a8ceb99b1..e3fff031e 100644 --- a/criu/pie/restorer.c +++ b/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" diff --git a/criu/pie/util-fd.c b/criu/pie/util-fd.c index 14d7d1450..9b9f432e9 100644 --- a/criu/pie/util-fd.c +++ b/criu/pie/util-fd.c @@ -1,13 +1,13 @@ #include #include #include - +#include #include +#include "asm/int.h" #include "compiler.h" #include "log.h" #include "asm/string.h" -#include "asm/types.h" #ifdef CR_NOGLIBC # include "syscall.h" diff --git a/criu/pie/util-vdso.c b/criu/pie/util-vdso.c index 98ce078b6..ffde6d1ca 100644 --- a/criu/pie/util-vdso.c +++ b/criu/pie/util-vdso.c @@ -11,7 +11,6 @@ #include #include "asm/string.h" -#include "asm/types.h" #include "image.h" #include "util-vdso.h" diff --git a/criu/pie/util.c b/criu/pie/util.c index 7dcef39a6..ac5ebdf55 100644 --- a/criu/pie/util.c +++ b/criu/pie/util.c @@ -3,10 +3,11 @@ #include #include #include +#include +#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" diff --git a/criu/proc_parse.c b/criu/proc_parse.c index c82025ab9..f3b77e931 100644 --- a/criu/proc_parse.c +++ b/criu/proc_parse.c @@ -10,7 +10,7 @@ #include #include -#include "asm/types.h" +#include "asm/int.h" #include "common/list.h" #include "util.h" #include "mount.h" diff --git a/criu/protobuf-desc.c b/criu/protobuf-desc.c index 9352a76cc..a6807e269 100644 --- a/criu/protobuf-desc.c +++ b/criu/protobuf-desc.c @@ -8,8 +8,6 @@ #include #include -#include "asm/types.h" - #include "compiler.h" #include "log.h" diff --git a/criu/protobuf.c b/criu/protobuf.c index adcfd4f4f..9a90798a1 100644 --- a/criu/protobuf.c +++ b/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" diff --git a/criu/pstree.c b/criu/pstree.c index d23b1f18c..dac967a78 100644 --- a/criu/pstree.c +++ b/criu/pstree.c @@ -3,6 +3,7 @@ #include #include +#include "types.h" #include "cr_options.h" #include "pstree.h" #include "rst-malloc.h" diff --git a/criu/ptrace.c b/criu/ptrace.c index 155600d25..bc402d6c6 100644 --- a/criu/ptrace.c +++ b/criu/ptrace.c @@ -14,8 +14,8 @@ #include #include +#include "asm/int.h" #include "compiler.h" -#include "asm/types.h" #include "util.h" #include "ptrace.h" #include "pid.h" diff --git a/criu/rst-malloc.c b/criu/rst-malloc.c index 2e89d599a..630127dba 100644 --- a/criu/rst-malloc.c +++ b/criu/rst-malloc.c @@ -2,9 +2,9 @@ #include #include +#include "asm/page.h" #include "rst-malloc.h" #include "bug.h" -#include "asm/types.h" struct rst_mem_type_s { bool remapable; diff --git a/criu/seize.c b/criu/seize.c index ef1b3563c..69fab6496 100644 --- a/criu/seize.c +++ b/criu/seize.c @@ -9,6 +9,7 @@ #include #include +#include "asm/int.h" #include "compiler.h" #include "cr_options.h" #include "cr-errno.h" diff --git a/criu/shmem.c b/criu/shmem.c index 6404ece2b..0bd3de27e 100644 --- a/criu/shmem.c +++ b/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" diff --git a/criu/signalfd.c b/criu/signalfd.c index c99227420..07d0bd6da 100644 --- a/criu/signalfd.c +++ b/criu/signalfd.c @@ -3,7 +3,6 @@ #include #include "compiler.h" -#include "asm/types.h" #include "signalfd.h" #include "fdinfo.h" #include "imgset.h" diff --git a/criu/sk-inet.c b/criu/sk-inet.c index f4bc51923..2e254f43e 100644 --- a/criu/sk-inet.c +++ b/criu/sk-inet.c @@ -11,7 +11,6 @@ #include #include -#include "asm/types.h" #include "libnetlink.h" #include "cr_options.h" #include "imgset.h" diff --git a/criu/sk-packet.c b/criu/sk-packet.c index d82268e5c..8714f40ca 100644 --- a/criu/sk-packet.c +++ b/criu/sk-packet.c @@ -5,7 +5,6 @@ #include #include #include -#include "asm/types.h" #include "imgset.h" #include "files.h" #include "sockets.h" diff --git a/criu/sk-queue.c b/criu/sk-queue.c index fee6d6cbd..d4140ba92 100644 --- a/criu/sk-queue.c +++ b/criu/sk-queue.c @@ -10,7 +10,6 @@ #include #include -#include "asm/types.h" #include "common/list.h" #include "imgset.h" #include "image.h" diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c index 32ce32b01..ff25dabc1 100644 --- a/criu/sk-tcp.c +++ b/criu/sk-tcp.c @@ -8,11 +8,11 @@ #include #include +#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" diff --git a/criu/sk-unix.c b/criu/sk-unix.c index 99f0b08b9..1fc1280ac 100644 --- a/criu/sk-unix.c +++ b/criu/sk-unix.c @@ -10,7 +10,6 @@ #include #include -#include "asm/types.h" #include "libnetlink.h" #include "cr_options.h" #include "imgset.h" diff --git a/criu/sockets.c b/criu/sockets.c index c81ac3272..df5d70a67 100644 --- a/criu/sockets.c +++ b/criu/sockets.c @@ -9,6 +9,8 @@ #include #include +#include "asm/int.h" +#include "asm/bitops.h" #include "libnetlink.h" #include "sockets.h" #include "unix_diag.h" diff --git a/criu/sysctl.c b/criu/sysctl.c index 87bd267fd..1f3c9af90 100644 --- a/criu/sysctl.c +++ b/criu/sysctl.c @@ -7,7 +7,6 @@ #include #include -#include "asm/types.h" #include "namespaces.h" #include "sysctl.h" #include "util.h" diff --git a/criu/timerfd.c b/criu/timerfd.c index 53be2af7b..fcebe42e4 100644 --- a/criu/timerfd.c +++ b/criu/timerfd.c @@ -5,6 +5,7 @@ #include #include +#include "asm/int.h" #include "protobuf.h" #include "images/timerfd.pb-c.h" diff --git a/criu/tty.c b/criu/tty.c index 31db54bf6..557dd777e 100644 --- a/criu/tty.c +++ b/criu/tty.c @@ -12,9 +12,8 @@ #include #include +#include "types.h" #include "compiler.h" -#include "asm/types.h" - #include "crtools.h" #include "files.h" #include "cr_options.h" diff --git a/criu/util.c b/criu/util.c index 95817c32a..2702b19c1 100644 --- a/criu/util.c +++ b/criu/util.c @@ -35,8 +35,10 @@ #include #include +#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" diff --git a/criu/uts_ns.c b/criu/uts_ns.c index 1ea075cbd..d1bc0cf18 100644 --- a/criu/uts_ns.c +++ b/criu/uts_ns.c @@ -4,6 +4,7 @@ #include #include +#include "asm/int.h" #include "util.h" #include "namespaces.h" #include "sysctl.h" diff --git a/criu/vdso.c b/criu/vdso.c index 517755513..0b4b52e34 100644 --- a/criu/vdso.c +++ b/criu/vdso.c @@ -9,7 +9,6 @@ #include #include -#include "asm/types.h" #include "asm/parasite-syscall.h" #include "parasite-syscall.h"