[09/13] Hide asm/restorer.h from sources

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

Details

Message ID 58092BED.4060405@virtuozzo.com
State Accepted
Series "criu: Remove asm/ includes from non-arch sources"
Commit 917c8206ce15cf12c78503b5243d77590567470b
Headers show

Commit Message

Pavel Emelianov Oct. 20, 2016, 8:41 p.m.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 criu/cr-restore.c       | 1 -
 criu/kerndat.c          | 4 +---
 criu/parasite-syscall.c | 2 +-
 criu/pie/parasite.c     | 2 +-
 criu/pie/restorer.c     | 2 +-
 criu/sigframe.c         | 1 -
 6 files changed, 4 insertions(+), 8 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index eb93cf1..837c232 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -26,7 +26,6 @@ 
 #include "types.h"
 #include "ptrace.h"
 #include "compiler.h"
-#include "asm/restorer.h"
 
 #include "cr_options.h"
 #include "servicefd.h"
diff --git a/criu/kerndat.c b/criu/kerndat.c
index 902601e..225a6ba 100644
--- a/criu/kerndat.c
+++ b/criu/kerndat.c
@@ -8,15 +8,13 @@ 
 #include <errno.h>
 #include <sys/syscall.h>
 
-#include "int.h"
 #include "log.h"
-#include "bug.h"
+#include "restorer.h"
 #include "kerndat.h"
 #include "fs-magic.h"
 #include "mem.h"
 #include "compiler.h"
 #include "sysctl.h"
-#include "asm/restorer.h"
 #include "cr_options.h"
 #include "util.h"
 #include "lsm.h"
diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 3dfc525..e6e8488 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -38,7 +38,7 @@ 
 
 #include "asm/parasite-syscall.h"
 #include "asm/dump.h"
-#include "asm/restorer.h"
+#include "restorer.h"
 #include "pie/pie-relocs.h"
 
 #define MEMFD_FNAME	"CRIUMFD"
diff --git a/criu/pie/parasite.c b/criu/pie/parasite.c
index 7031db1..5ef518d 100644
--- a/criu/pie/parasite.c
+++ b/criu/pie/parasite.c
@@ -20,7 +20,7 @@ 
 #include "aio.h"
 
 #include "asm/parasite.h"
-#include "asm/restorer.h"
+#include "restorer.h"
 
 int compel_main(void *arg_p, unsigned int arg_s)
 {
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 3f3880d..04e54f1 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -41,7 +41,7 @@ 
 #include "images/mm.pb-c.h"
 
 #include "shmem.h"
-#include "asm/restorer.h"
+#include "restorer.h"
 
 #ifndef PR_SET_PDEATHSIG
 #define PR_SET_PDEATHSIG 1
diff --git a/criu/sigframe.c b/criu/sigframe.c
index 108b0cf..68fb8fc 100644
--- a/criu/sigframe.c
+++ b/criu/sigframe.c
@@ -2,7 +2,6 @@ 
 #include <string.h>
 
 #include "asm/restore.h"
-#include "asm/restorer.h"
 
 #include "images/core.pb-c.h"