[CRIU] [PATCH 10/10] common: Move page.h in

Cyrill Gorcunov gorcunov at openvz.org
Mon Oct 24 04:58:10 PDT 2016


Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 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/include/page.h                                                   | 2 +-
 {criu/arch/aarch64/include => include/common/arch/aarch64}/asm/page.h | 0
 {criu/arch/x86/include => include/common/arch/arm}/asm/page.h         | 0
 {criu/arch/ppc64/include => include/common/arch/ppc64}/asm/page.h     | 0
 {criu/arch/arm/include => include/common/arch/x86}/asm/page.h         | 0
 include/common/page.h                                                 | 4 ++++
 10 files changed, 9 insertions(+), 5 deletions(-)
 rename {criu/arch/aarch64/include => include/common/arch/aarch64}/asm/page.h (100%)
 rename {criu/arch/x86/include => include/common/arch/arm}/asm/page.h (100%)
 rename {criu/arch/ppc64/include => include/common/arch/ppc64}/asm/page.h (100%)
 rename {criu/arch/arm/include => include/common/arch/x86}/asm/page.h (100%)
 create mode 100644 include/common/page.h

diff --git a/criu/arch/aarch64/include/asm/types.h b/criu/arch/aarch64/include/asm/types.h
index bb9896c36839..d26baf4aa54f 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 "page.h"
 #include "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 ee63ba6df16d..806c980a02dd 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 "page.h"
 #include "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 a4089eedc0bf..34661bab70a8 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 "page.h"
 #include "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 c371e4b98876..41d3b647a558 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 "page.h"
 #include "bitops.h"
 #include "asm/int.h"
 
diff --git a/criu/include/page.h b/criu/include/page.h
index 6495ec084fd6..47e6808d88e4 100644
--- a/criu/include/page.h
+++ b/criu/include/page.h
@@ -1,4 +1,4 @@
 #ifndef __CR_INC_PAGE_H__
 #define __CR_INC_PAGE_H__
-#include "asm/page.h"
+#include "common/page.h"
 #endif
diff --git a/criu/arch/aarch64/include/asm/page.h b/include/common/arch/aarch64/asm/page.h
similarity index 100%
rename from criu/arch/aarch64/include/asm/page.h
rename to include/common/arch/aarch64/asm/page.h
diff --git a/criu/arch/x86/include/asm/page.h b/include/common/arch/arm/asm/page.h
similarity index 100%
rename from criu/arch/x86/include/asm/page.h
rename to include/common/arch/arm/asm/page.h
diff --git a/criu/arch/ppc64/include/asm/page.h b/include/common/arch/ppc64/asm/page.h
similarity index 100%
rename from criu/arch/ppc64/include/asm/page.h
rename to include/common/arch/ppc64/asm/page.h
diff --git a/criu/arch/arm/include/asm/page.h b/include/common/arch/x86/asm/page.h
similarity index 100%
rename from criu/arch/arm/include/asm/page.h
rename to include/common/arch/x86/asm/page.h
diff --git a/include/common/page.h b/include/common/page.h
new file mode 100644
index 000000000000..2734571cd542
--- /dev/null
+++ b/include/common/page.h
@@ -0,0 +1,4 @@
+#ifndef __CR_COMMON_PAGE_H__
+#define __CR_COMMON_PAGE_H__
+#include "asm/page.h"
+#endif
-- 
2.7.4



More information about the CRIU mailing list