[10/10] crtools.h: Move LAST_PID_PATH to util.h

Submitted by Pavel Emelianov on May 20, 2016, 4:55 p.m.

Details

Message ID 573F4181.5070007@virtuozzo.com
State Accepted
Series "Some cleanups over headers"
Commit 3039b6625e16e0cd6e1ba5b7b87c0b8ba0cf8e47
Headers show

Commit Message

Pavel Emelianov May 20, 2016, 4:55 p.m.
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 criu/include/crtools.h | 2 --
 criu/include/util.h    | 2 ++
 criu/pie/restorer.c    | 1 -
 criu/ptrace.c          | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/include/crtools.h b/criu/include/crtools.h
index f74c433..f3c9f7f 100644
--- a/criu/include/crtools.h
+++ b/criu/include/crtools.h
@@ -16,8 +16,6 @@  extern int write_img_inventory(InventoryEntry *he);
 extern int prepare_inventory(InventoryEntry *he);
 extern int add_post_prepare_cb(int (*actor)(void *data), void *data);
 
-#define LAST_PID_PATH		"sys/kernel/ns_last_pid"
-
 extern int cr_dump_tasks(pid_t pid);
 extern int cr_pre_dump_tasks(pid_t pid);
 extern int cr_restore_tasks(void);
diff --git a/criu/include/util.h b/criu/include/util.h
index 3b0b93b..72fbd1d 100644
--- a/criu/include/util.h
+++ b/criu/include/util.h
@@ -278,4 +278,6 @@  int setup_tcp_server(char *type);
 int run_tcp_server(bool daemon_mode, int *ask, int cfd, int sk);
 int setup_tcp_client(char *addr);
 
+#define LAST_PID_PATH		"sys/kernel/ns_last_pid"
+
 #endif /* __CR_UTIL_H__ */
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index 9249b9d..54f5e74 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -31,7 +31,6 @@ 
 #include "vma.h"
 #include "uffd.h"
 
-#include "crtools.h"
 #include "lock.h"
 #include "restorer.h"
 #include "aio.h"
diff --git a/criu/ptrace.c b/criu/ptrace.c
index 16c0b5b..45271c6 100644
--- a/criu/ptrace.c
+++ b/criu/ptrace.c
@@ -20,7 +20,6 @@ 
 #include "ptrace.h"
 #include "pid.h"
 #include "proc_parse.h"
-#include "crtools.h"
 #include "seccomp.h"
 #include "cr_options.h"