From patchwork Thu Oct 20 20:42:31 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [13/13] Add missing headers for ppc64, arm and aarch
From: Pavel Emelyanov <xemul@virtuozzo.com>
X-Patchwork-Id: 2096
Message-Id: <58092C37.4020006@virtuozzo.com>
To: CRIU <criu@openvz.org>
Date: Thu, 20 Oct 2016 23:42:31 +0300

While tossing headers around non-x86 builds got broken
so move back missing parts for other arches. Other than
criu/arch/ stuff this is mostly int.h over .c files.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 criu/arch/aarch64/crtools.c                  | 1 -
 criu/arch/arm/crtools.c                      | 1 -
 criu/arch/arm/include/asm/parasite-syscall.h | 1 +
 criu/arch/ppc64/include/asm/restorer.h       | 1 +
 criu/autofs.c                                | 1 +
 criu/cr-dedup.c                              | 1 +
 criu/crtools.c                               | 1 +
 criu/kerndat.c                               | 1 +
 criu/proc_parse.c                            | 2 +-
 criu/stats.c                                 | 1 +
 criu/sysctl.c                                | 1 +
 criu/sysfs_parse.c                           | 1 +
 criu/uffd.c                                  | 1 +
 criu/vdso.c                                  | 1 +
 14 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/criu/arch/aarch64/crtools.c b/criu/arch/aarch64/crtools.c
index 9e0bd99..8f248b5 100644
--- a/criu/arch/aarch64/crtools.c
+++ b/criu/arch/aarch64/crtools.c
@@ -15,7 +15,6 @@
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
-#include "parasite-syscall.h"
 #include "restorer.h"
 
 
diff --git a/criu/arch/arm/crtools.c b/criu/arch/arm/crtools.c
index 5325ff0..1168f94 100644
--- a/criu/arch/arm/crtools.c
+++ b/criu/arch/arm/crtools.c
@@ -9,7 +9,6 @@
 #include "protobuf.h"
 #include "images/core.pb-c.h"
 #include "images/creds.pb-c.h"
-#include "parasite-syscall.h"
 #include "log.h"
 #include "util.h"
 #include "cpu.h"
diff --git a/criu/arch/arm/include/asm/parasite-syscall.h b/criu/arch/arm/include/asm/parasite-syscall.h
index a9defef..7a5591a 100644
--- a/criu/arch/arm/include/asm/parasite-syscall.h
+++ b/criu/arch/arm/include/asm/parasite-syscall.h
@@ -1,6 +1,7 @@
 #ifndef __CR_ASM_PARASITE_SYSCALL_H__
 #define __CR_ASM_PARASITE_SYSCALL_H__
 
+struct parasite_ctl;
 
 #define ARCH_SI_TRAP TRAP_BRKPT
 
diff --git a/criu/arch/ppc64/include/asm/restorer.h b/criu/arch/ppc64/include/asm/restorer.h
index 6b6135c..7f7074c 100644
--- a/criu/arch/ppc64/include/asm/restorer.h
+++ b/criu/arch/ppc64/include/asm/restorer.h
@@ -4,6 +4,7 @@
 #include <asm/ptrace.h>
 #include <asm/elf.h>
 #include <asm/types.h>
+#include "asm/types.h"
 
 /*
  * sigcontext structure defined in file
diff --git a/criu/autofs.c b/criu/autofs.c
index 3db060a..0e9883f 100644
--- a/criu/autofs.c
+++ b/criu/autofs.c
@@ -4,6 +4,7 @@
 #include <sys/mount.h>
 #include <sys/wait.h>
 
+#include "int.h"
 #include "fdinfo.h"
 #include "autofs.h"
 #include "rst-malloc.h"
diff --git a/criu/cr-dedup.c b/criu/cr-dedup.c
index 745b17b..210e802 100644
--- a/criu/cr-dedup.c
+++ b/criu/cr-dedup.c
@@ -3,6 +3,7 @@
 #include <linux/falloc.h>
 #include <unistd.h>
 
+#include "int.h"
 #include "crtools.h"
 #include "pagemap.h"
 #include "restorer.h"
diff --git a/criu/crtools.c b/criu/crtools.c
index 225c083..bdf04e5 100644
--- a/criu/crtools.c
+++ b/criu/crtools.c
@@ -20,6 +20,7 @@
 #include <dlfcn.h>
 
 #include "int.h"
+#include "page.h"
 #include "compiler.h"
 #include "crtools.h"
 #include "cr_options.h"
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 225a6ba..a0513af 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -8,6 +8,7 @@
 #include <errno.h>
 #include <sys/syscall.h>
 
+#include "int.h"
 #include "log.h"
 #include "restorer.h"
 #include "kerndat.h"
diff --git a/criu/proc_parse.c b/criu/proc_parse.c
index 76dd97e..f5ff4d1 100644
--- a/criu/proc_parse.c
+++ b/criu/proc_parse.c
@@ -10,7 +10,7 @@
 #include <ctype.h>
 #include <linux/fs.h>
 
-#include "int.h"
+#include "types.h"
 #include "list.h"
 #include "util.h"
 #include "mount.h"
diff --git a/criu/stats.c b/criu/stats.c
index 1a3707e..c6cbc83 100644
--- a/criu/stats.c
+++ b/criu/stats.c
@@ -1,6 +1,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
+#include "int.h"
 #include "atomic.h"
 #include "cr_options.h"
 #include "rst-malloc.h"
diff --git a/criu/sysctl.c b/criu/sysctl.c
index 1f3c9af..b249156 100644
--- a/criu/sysctl.c
+++ b/criu/sysctl.c
@@ -7,6 +7,7 @@
 #include <sys/wait.h>
 #include <sched.h>
 
+#include "int.h"
 #include "namespaces.h"
 #include "sysctl.h"
 #include "util.h"
diff --git a/criu/sysfs_parse.c b/criu/sysfs_parse.c
index 9ec148c..a17ea81 100644
--- a/criu/sysfs_parse.c
+++ b/criu/sysfs_parse.c
@@ -8,6 +8,7 @@
 #include <dirent.h>
 #include <sys/stat.h>
 
+#include "int.h"
 #include "cr_options.h"
 #include "criu-log.h"
 #include "xmalloc.h"
diff --git a/criu/uffd.c b/criu/uffd.c
index 66a63f2..2a9dab4 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -18,6 +18,7 @@
 
 #include "linux/userfaultfd.h"
 
+#include "int.h"
 #include "page.h"
 #include "log.h"
 #include "criu-plugin.h"
diff --git a/criu/vdso.c b/criu/vdso.c
index 39b66c6..1eb08d2 100644
--- a/criu/vdso.c
+++ b/criu/vdso.c
@@ -9,6 +9,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
+#include "types.h"
 #include "parasite-syscall.h"
 #include "parasite.h"
 #include "compiler.h"