criu: Fix headers for non-x86 arches.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

compel/include/uapi/ksigset.h

 #ifndef __COMPEL_KSIGSET_H__
 #define __COMPEL_KSIGSET_H__
 
+#include <compel/plugins/std/asm/syscall-types.h>
+
 static inline void ksigfillset(k_rtsigset_t *set)
 {
 	int i;

criu/arch/aarch64/crtools.c

@@ -6,6 +6,7 @@
 #include "types.h"
 #include <compel/asm/processor-flags.h>
 
+#include "asm/infect-types.h"
 #include "asm/restorer.h"
 #include "common/compiler.h"
 #include "ptrace.h"

criu/arch/aarch64/include/asm/infect-types.h

@@ -7,6 +7,8 @@
 #include <asm/ptrace.h>
 #include "common/page.h"
 
+#include "page.h"
+
 #define SIGMAX			64
 #define SIGMAX_OLD		31
 

criu/arch/aarch64/infect.c

@@ -83,7 +83,7 @@ int compel_syscall(struct parasite_ctl *ctl, int nr, unsigned long *ret,
 	return err;
 }
 
-void *mmap_re(struct parasite_ctl *ctl,
+void *remote_mmap(struct parasite_ctl *ctl,
 		void *addr, size_t length, int prot,
 		int flags, int fd, off_t offset)
 {

criu/arch/arm/crtools.c

@@ -4,11 +4,11 @@
 #include "types.h"
 #include <compel/asm/processor-flags.h>
 
+#include "asm/infect-types.h"
 #include "asm/restorer.h"
 #include "common/compiler.h"
 #include "asm/dump.h"
 #include "ptrace.h"
-#include "compel/include/asm/processor-flags.h"
 #include "protobuf.h"
 #include "images/core.pb-c.h"
 #include "images/creds.pb-c.h"

criu/arch/arm/include/asm/infect-types.h

@@ -5,6 +5,8 @@
 #include <sys/mman.h>
 #include "common/page.h"
 
+#include "page.h"
+
 #define SIGMAX			64
 #define SIGMAX_OLD		31
 

criu/arch/arm/infect.c

@@ -2,6 +2,7 @@
 #include <sys/types.h>
 #include "asm/parasite-syscall.h"
 #include <compel/plugins/std/syscall-codes.h>
+#include <compel/asm/processor-flags.h>
 #include "asm/types.h"
 #include "criu-log.h"
 #include "kerndat.h"

criu/arch/ppc64/include/asm/restorer.h

@@ -5,6 +5,7 @@
 #include <asm/elf.h>
 #include <asm/types.h>
 #include "asm/types.h"
+#include "asm/infect-types.h"
 
 #include "sigframe.h"
 

criu/cr-restore.c

@@ -23,6 +23,8 @@
 
 #include <sys/sendfile.h>
 
+#include "compel/include/asm/ptrace.h"
+
 #include "types.h"
 #include "ptrace.h"
 #include "common/compiler.h"

criu/infect.c

@@ -20,6 +20,7 @@
 #include <compel/plugins/std/asm/syscall-types.h>
 #include "compel/include/asm/ptrace.h"
 #include "compel/include/asm/syscall.h"
+#include "asm/infect-types.h"
 #include "asm/sigframe.h"
 #include "infect.h"
 #include "ptrace.h"