[CRIU] [PATCH 31/38] compel: Wire in page.h

Cyrill Gorcunov gorcunov at openvz.org
Tue Oct 11 09:04:21 PDT 2016


Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 .../include => compel/arch/aarch64/src/lib/include/compel}/asm/page.h   | 0
 .../x86/include => compel/arch/arm/src/lib/include/compel}/asm/page.h   | 0
 .../include => compel/arch/ppc64/src/lib/include/compel}/asm/page.h     | 0
 .../arm/include => compel/arch/x86/src/lib/include/compel}/asm/page.h   | 0
 criu/arch/aarch64/include/asm/types.h                                   | 2 +-
 criu/arch/arm/include/asm/types.h                                       | 2 +-
 criu/arch/ppc64/include/asm/types.h                                     | 2 +-
 criu/arch/x86/include/asm/types.h                                       | 2 +-
 criu/bfd.c                                                              | 2 +-
 criu/include/pagemap-cache.h                                            | 2 +-
 criu/pie/parasite-vdso.c                                                | 2 +-
 criu/uffd.c                                                             | 2 +-
 12 files changed, 8 insertions(+), 8 deletions(-)
 rename {criu/arch/aarch64/include => compel/arch/aarch64/src/lib/include/compel}/asm/page.h (100%)
 rename {criu/arch/x86/include => compel/arch/arm/src/lib/include/compel}/asm/page.h (100%)
 rename {criu/arch/ppc64/include => compel/arch/ppc64/src/lib/include/compel}/asm/page.h (100%)
 rename {criu/arch/arm/include => compel/arch/x86/src/lib/include/compel}/asm/page.h (100%)

diff --git a/criu/arch/aarch64/include/asm/page.h b/compel/arch/aarch64/src/lib/include/compel/asm/page.h
similarity index 100%
rename from criu/arch/aarch64/include/asm/page.h
rename to compel/arch/aarch64/src/lib/include/compel/asm/page.h
diff --git a/criu/arch/x86/include/asm/page.h b/compel/arch/arm/src/lib/include/compel/asm/page.h
similarity index 100%
rename from criu/arch/x86/include/asm/page.h
rename to compel/arch/arm/src/lib/include/compel/asm/page.h
diff --git a/criu/arch/ppc64/include/asm/page.h b/compel/arch/ppc64/src/lib/include/compel/asm/page.h
similarity index 100%
rename from criu/arch/ppc64/include/asm/page.h
rename to compel/arch/ppc64/src/lib/include/compel/asm/page.h
diff --git a/criu/arch/arm/include/asm/page.h b/compel/arch/x86/src/lib/include/compel/asm/page.h
similarity index 100%
rename from criu/arch/arm/include/asm/page.h
rename to compel/arch/x86/src/lib/include/compel/asm/page.h
diff --git a/criu/arch/aarch64/include/asm/types.h b/criu/arch/aarch64/include/asm/types.h
index 0fd5972ae543..d0823dde8d9d 100644
--- a/criu/arch/aarch64/include/asm/types.h
+++ b/criu/arch/aarch64/include/asm/types.h
@@ -6,7 +6,7 @@
 #include <asm/ptrace.h>
 #include "images/core.pb-c.h"
 
-#include "asm/page.h"
+#include "compel/asm/page.h"
 #include "asm/bitops.h"
 #include "asm/int.h"
 
diff --git a/criu/arch/arm/include/asm/types.h b/criu/arch/arm/include/asm/types.h
index 4f3b7cf52d3b..6ca09ff5b1a9 100644
--- a/criu/arch/arm/include/asm/types.h
+++ b/criu/arch/arm/include/asm/types.h
@@ -5,7 +5,7 @@
 #include <signal.h>
 #include "images/core.pb-c.h"
 
-#include "asm/page.h"
+#include "compel/asm/page.h"
 #include "asm/bitops.h"
 #include "asm/int.h"
 
diff --git a/criu/arch/ppc64/include/asm/types.h b/criu/arch/ppc64/include/asm/types.h
index eeaef5925b81..b8dc6658682f 100644
--- a/criu/arch/ppc64/include/asm/types.h
+++ b/criu/arch/ppc64/include/asm/types.h
@@ -5,7 +5,7 @@
 #include <signal.h>
 #include "images/core.pb-c.h"
 
-#include "asm/page.h"
+#include "compel/asm/page.h"
 #include "asm/bitops.h"
 #include "asm/int.h"
 
diff --git a/criu/arch/x86/include/asm/types.h b/criu/arch/x86/include/asm/types.h
index fef94f3c1855..72e35da3d0b0 100644
--- a/criu/arch/x86/include/asm/types.h
+++ b/criu/arch/x86/include/asm/types.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <signal.h>
 
-#include "asm/page.h"
+#include "compel/asm/page.h"
 #include "asm/bitops.h"
 #include "asm/int.h"
 
diff --git a/criu/bfd.c b/criu/bfd.c
index 66c318c6ee5b..9256edc161bb 100644
--- a/criu/bfd.c
+++ b/criu/bfd.c
@@ -13,7 +13,7 @@
 #include "list.h"
 #include "util.h"
 #include "xmalloc.h"
-#include "asm/page.h"
+#include "compel/asm/page.h"
 
 #undef	LOG_PREFIX
 #define LOG_PREFIX "bfd: "
diff --git a/criu/include/pagemap-cache.h b/criu/include/pagemap-cache.h
index e0880906d74f..16b627da49ec 100644
--- a/criu/include/pagemap-cache.h
+++ b/criu/include/pagemap-cache.h
@@ -2,7 +2,7 @@
 #define __CR_PAGEMAP_H__
 
 #include <sys/types.h>
-#include "asm/page.h"
+#include "compel/asm/page.h"
 #include "asm/int.h"
 
 #include "list.h"
diff --git a/criu/pie/parasite-vdso.c b/criu/pie/parasite-vdso.c
index ea8a1f2b1d75..e1c5be921fc2 100644
--- a/criu/pie/parasite-vdso.c
+++ b/criu/pie/parasite-vdso.c
@@ -11,7 +11,7 @@
 
 #include "asm/string.h"
 #include "asm/types.h"
-#include "asm/page.h"
+#include "compel/asm/page.h"
 
 #include "uapi/std/syscall.h"
 #include "image.h"
diff --git a/criu/uffd.c b/criu/uffd.c
index a280f6a31c8c..e2b15417c265 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -18,7 +18,7 @@
 
 #include "linux/userfaultfd.h"
 
-#include "asm/page.h"
+#include "compel/asm/page.h"
 #include "log.h"
 #include "criu-plugin.h"
 #include "pagemap.h"
-- 
2.7.4



More information about the CRIU mailing list