[CRIU] [PATCH 03/13] Hide asm/page.h from sources

Pavel Emelyanov xemul at virtuozzo.com
Thu Oct 20 13:35:37 PDT 2016


Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
 criu/bfd.c                   | 2 +-
 criu/include/page.h          | 4 ++++
 criu/include/pagemap-cache.h | 1 -
 criu/log.c                   | 2 +-
 criu/namespaces.c            | 2 +-
 criu/page-pipe.c             | 2 +-
 criu/pagemap-cache.c         | 1 +
 criu/pie/parasite-vdso.c     | 2 +-
 criu/rst-malloc.c            | 2 +-
 criu/shmem.c                 | 2 +-
 criu/uffd.c                  | 2 +-
 criu/util.c                  | 2 +-
 12 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 criu/include/page.h

diff --git a/criu/bfd.c b/criu/bfd.c
index 51d50c1..2fc583a 100644
--- a/criu/bfd.c
+++ b/criu/bfd.c
@@ -14,7 +14,7 @@
 #include "list.h"
 #include "util.h"
 #include "xmalloc.h"
-#include "asm/page.h"
+#include "page.h"
 
 #undef	LOG_PREFIX
 #define LOG_PREFIX "bfd: "
diff --git a/criu/include/page.h b/criu/include/page.h
new file mode 100644
index 0000000..6495ec0
--- /dev/null
+++ b/criu/include/page.h
@@ -0,0 +1,4 @@
+#ifndef __CR_INC_PAGE_H__
+#define __CR_INC_PAGE_H__
+#include "asm/page.h"
+#endif
diff --git a/criu/include/pagemap-cache.h b/criu/include/pagemap-cache.h
index 29b284b..9e17ef9 100644
--- a/criu/include/pagemap-cache.h
+++ b/criu/include/pagemap-cache.h
@@ -2,7 +2,6 @@
 #define __CR_PAGEMAP_H__
 
 #include <sys/types.h>
-#include "asm/page.h"
 #include "int.h"
 
 #include "list.h"
diff --git a/criu/log.c b/criu/log.c
index 6a3ed4f..30ca46f 100644
--- a/criu/log.c
+++ b/criu/log.c
@@ -13,7 +13,7 @@
 #include <fcntl.h>
 
 #include "int.h"
-#include "asm/page.h"
+#include "page.h"
 #include "compiler.h"
 #include "util.h"
 #include "cr_options.h"
diff --git a/criu/namespaces.c b/criu/namespaces.c
index 53fd2bf..69f122b 100644
--- a/criu/namespaces.c
+++ b/criu/namespaces.c
@@ -14,7 +14,7 @@
 #include <limits.h>
 #include <errno.h>
 
-#include "asm/page.h"
+#include "page.h"
 #include "rst-malloc.h"
 #include "cr_options.h"
 #include "imgset.h"
diff --git a/criu/page-pipe.c b/criu/page-pipe.c
index 79f0078..c67e073 100644
--- a/criu/page-pipe.c
+++ b/criu/page-pipe.c
@@ -4,7 +4,7 @@
 #define LOG_PREFIX "page-pipe: "
 
 #include "int.h"
-#include "asm/page.h"
+#include "page.h"
 #include "config.h"
 #include "util.h"
 #include "page-pipe.h"
diff --git a/criu/pagemap-cache.c b/criu/pagemap-cache.c
index 5a8def9..20e69f7 100644
--- a/criu/pagemap-cache.c
+++ b/criu/pagemap-cache.c
@@ -1,6 +1,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include "page.h"
 #include "pagemap-cache.h"
 #include "compiler.h"
 #include "xmalloc.h"
diff --git a/criu/pie/parasite-vdso.c b/criu/pie/parasite-vdso.c
index 17aadbe..3ddd285 100644
--- a/criu/pie/parasite-vdso.c
+++ b/criu/pie/parasite-vdso.c
@@ -10,7 +10,7 @@
 #include <sys/mman.h>
 
 #include "asm/string.h"
-#include "asm/page.h"
+#include "page.h"
 
 #include "uapi/std/syscall.h"
 #include "image.h"
diff --git a/criu/rst-malloc.c b/criu/rst-malloc.c
index 630127d..100b7f8 100644
--- a/criu/rst-malloc.c
+++ b/criu/rst-malloc.c
@@ -2,7 +2,7 @@
 #include <stdbool.h>
 #include <sys/mman.h>
 
-#include "asm/page.h"
+#include "page.h"
 #include "rst-malloc.h"
 #include "bug.h"
 
diff --git a/criu/shmem.c b/criu/shmem.c
index 3b442c2..e49389d 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -19,7 +19,7 @@
 #include "uapi/std/syscall-codes.h"
 #include "asm/bitops.h"
 #include "criu-log.h"
-#include "asm/page.h"
+#include "page.h"
 
 #include "protobuf.h"
 #include "images/pagemap.pb-c.h"
diff --git a/criu/uffd.c b/criu/uffd.c
index f3ee0f8..66a63f2 100644
--- a/criu/uffd.c
+++ b/criu/uffd.c
@@ -18,7 +18,7 @@
 
 #include "linux/userfaultfd.h"
 
-#include "asm/page.h"
+#include "page.h"
 #include "log.h"
 #include "criu-plugin.h"
 #include "pagemap.h"
diff --git a/criu/util.c b/criu/util.c
index 7affad5..cf283fb 100644
--- a/criu/util.c
+++ b/criu/util.c
@@ -37,7 +37,7 @@
 
 #include "int.h"
 #include "asm/bitops.h"
-#include "asm/page.h"
+#include "page.h"
 #include "compiler.h"
 #include "list.h"
 #include "util.h"
-- 
2.1.4



More information about the CRIU mailing list