[CRIU] [PATCH 58/78] criu: Fix headers for non-x86 arches.

[Cyrill Gorcunov]

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 compel/include/uapi/ksigset.h                | 2 ++
 criu/arch/aarch64/crtools.c                  | 1 +
 criu/arch/aarch64/include/asm/infect-types.h | 2 ++
 criu/arch/aarch64/infect.c                   | 2 +-
 criu/arch/arm/crtools.c                      | 2 +-
 criu/arch/arm/include/asm/infect-types.h     | 2 ++
 criu/arch/arm/infect.c                       | 1 +
 criu/arch/ppc64/include/asm/restorer.h       | 1 +
 criu/cr-restore.c                            | 2 ++
 criu/infect.c                                | 1 +
 10 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/compel/include/uapi/ksigset.h b/compel/include/uapi/ksigset.h
index 412899c8c88a..ed6950a33cb8 100644
--- a/compel/include/uapi/ksigset.h
+++ b/compel/include/uapi/ksigset.h
@@ -1,6 +1,8 @@
 #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;
diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index fd34484dfe5a..d3cbc7e6f53f 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/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"
diff --git a/criu/arch/aarch64/include/asm/infect-types.h b/criu/arch/aarch64/include/asm/infect-types.h
index 7bc195b14d92..20c47b34edaf 100644
--- a/criu/arch/aarch64/include/asm/infect-types.h
+++ b/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
 
diff --git a/criu/arch/aarch64/infect.c b/criu/arch/aarch64/infect.c
index 067e558e0e80..3a9cb10cd229 100644
--- a/criu/arch/aarch64/infect.c
+++ b/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)
 {
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index 07c6473f5bdb..aa3860e93f6e 100644
--- a/criu/arch/arm/crtools.c
+++ b/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"
diff --git a/criu/arch/arm/include/asm/infect-types.h b/criu/arch/arm/include/asm/infect-types.h
index 1df9f6836069..944236d14989 100644
--- a/criu/arch/arm/include/asm/infect-types.h
+++ b/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
 
diff --git a/criu/arch/arm/infect.c b/criu/arch/arm/infect.c
index 357d4492b293..6fe6142be2de 100644
--- a/criu/arch/arm/infect.c
+++ b/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"
diff --git a/criu/arch/ppc64/include/asm/restorer.h b/criu/arch/ppc64/include/asm/restorer.h
index 5342fab68775..e99f2751b919 100644
--- a/criu/arch/ppc64/include/asm/restorer.h
+++ b/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"
 
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index e1d6ef627c13..834e30740006 100644
--- a/criu/cr-restore.c
+++ b/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"
diff --git a/criu/infect.c b/criu/infect.c
index d4e9d35790a9..fa9f270a5b0a 100644
--- a/criu/infect.c
+++ b/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"
-- 
2.7.4