[CRIU] [PATCH 40/78] infect: Move ksigset helpers into compel

[Cyrill Gorcunov]

From: Pavel Emelyanov <xemul at virtuozzo.com>

Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
 criu/include/signal.h => compel/include/uapi/ksigset.h | 4 ++--
 criu/include/infect.h                                  | 1 +
 criu/infect.c                                          | 1 -
 criu/pie/restorer.c                                    | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename criu/include/signal.h => compel/include/uapi/ksigset.h (87%)

diff --git a/criu/include/signal.h b/compel/include/uapi/ksigset.h
similarity index 87%
rename from criu/include/signal.h
rename to compel/include/uapi/ksigset.h
index 788b8e2b45ac..412899c8c88a 100644
--- a/criu/include/signal.h
+++ b/compel/include/uapi/ksigset.h
@@ -1,5 +1,5 @@
-#ifndef __CR_SIGNAL_H__
-#define __CR_SIGNAL_H__
+#ifndef __COMPEL_KSIGSET_H__
+#define __COMPEL_KSIGSET_H__
 
 static inline void ksigfillset(k_rtsigset_t *set)
 {
diff --git a/criu/include/infect.h b/criu/include/infect.h
index 40ec9132d19c..46d4691dfac9 100644
--- a/criu/include/infect.h
+++ b/criu/include/infect.h
@@ -2,6 +2,7 @@
 #define __COMPEL_INFECT_H__
 
 #include "types.h"
+#include "compel/include/uapi/ksigset.h"
 
 extern int compel_stop_task(int pid);
 
diff --git a/criu/infect.c b/criu/infect.c
index 14fcc74767f9..3c1b220d9d07 100644
--- a/criu/infect.c
+++ b/criu/infect.c
@@ -8,7 +8,6 @@
 
 #include "infect.h"
 #include "ptrace.h"
-#include "signal.h"
 #include "asm/parasite-syscall.h"
 #include "asm/dump.h"
 #include "restorer.h"
diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c
index e8e0a09b21dd..9573292ee318 100644
--- a/criu/pie/restorer.c
+++ b/criu/pie/restorer.c
@@ -22,6 +22,7 @@
 #include "common/compiler.h"
 #include "string.h"
 #include "uapi/std/syscall.h"
+#include "uapi/ksigset.h"
 #include "signal.h"
 #include "config.h"
 #include "prctl.h"
-- 
2.7.4