[04/13] Hide asm/string.h from sources

Submitted by Pavel Emelianov on Oct. 20, 2016, 8:35 p.m.

Details

Message ID 58092AAC.3090202@virtuozzo.com
State Accepted
Series "criu: Remove asm/ includes from non-arch sources"
Commit ca116d318069aa347200336f77fabd1f81b786b0
Headers show

Commit Message

Pavel Emelianov Oct. 20, 2016, 8:35 p.m.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 criu/include/string.h    | 1 +
 criu/pie/parasite-vdso.c | 1 -
 criu/pie/restorer.c      | 2 +-
 criu/pie/util-fd.c       | 2 +-
 criu/pie/util-vdso.c     | 3 +--
 criu/pie/util.c          | 1 -
 6 files changed, 4 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/include/string.h b/criu/include/string.h
index b469bfe..53c0098 100644
--- a/criu/include/string.h
+++ b/criu/include/string.h
@@ -3,6 +3,7 @@ 
 
 #include <sys/types.h>
 #include <string.h>
+#include "asm/string.h"
 
 #ifdef CONFIG_HAS_LIBBSD
 # include <bsd/string.h>
diff --git a/criu/pie/parasite-vdso.c b/criu/pie/parasite-vdso.c
index 3ddd285..d0bc2f7 100644
--- a/criu/pie/parasite-vdso.c
+++ b/criu/pie/parasite-vdso.c
@@ -9,7 +9,6 @@ 
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "asm/string.h"
 #include "page.h"
 
 #include "uapi/std/syscall.h"
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 91026bb..3f3880d 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -20,7 +20,7 @@ 
 #include "linux/userfaultfd.h"
 
 #include "compiler.h"
-#include "asm/string.h"
+#include "string.h"
 #include "uapi/std/syscall.h"
 #include "signal.h"
 #include "config.h"
diff --git a/criu/pie/util-fd.c b/criu/pie/util-fd.c
index 1ef7dd2..a96d97f 100644
--- a/criu/pie/util-fd.c
+++ b/criu/pie/util-fd.c
@@ -7,7 +7,7 @@ 
 #include "int.h"
 #include "compiler.h"
 #include "log.h"
-#include "asm/string.h"
+#include "string.h"
 
 #ifdef CR_NOGLIBC
 # include "uapi/std/syscall.h"
diff --git a/criu/pie/util-vdso.c b/criu/pie/util-vdso.c
index f83b312..90e55a9 100644
--- a/criu/pie/util-vdso.c
+++ b/criu/pie/util-vdso.c
@@ -10,8 +10,7 @@ 
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "asm/string.h"
-
+#include "string.h"
 #include "image.h"
 #include "util-vdso.h"
 #include "vma.h"
diff --git a/criu/pie/util.c b/criu/pie/util.c
index 25fe745..5cae88a 100644
--- a/criu/pie/util.c
+++ b/criu/pie/util.c
@@ -7,7 +7,6 @@ 
 
 #include "int.h"
 #include "compiler.h"
-#include "asm/string.h"
 #include "fcntl.h"
 #include "log.h"
 #include "util-pie.h"