[CRIU] [PATCH 77/78] compel: Move sigframe code into compel

[Cyrill Gorcunov]

We use it in both -- parasite engine and criu,
so export them as well.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 .../include => compel/arch/aarch64/src/lib/include/uapi}/asm/sigframe.h | 2 +-
 .../arm/include => compel/arch/arm/src/lib/include/uapi}/asm/sigframe.h | 2 +-
 .../include => compel/arch/ppc64/src/lib/include/uapi}/asm/sigframe.h   | 2 +-
 .../x86/include => compel/arch/x86/src/lib/include/uapi}/asm/sigframe.h | 2 +-
 {criu/include => compel/include/uapi}/sigframe-common.h                 | 0
 criu/arch/aarch64/include/asm/restorer.h                                | 2 +-
 criu/arch/arm/include/asm/restorer.h                                    | 2 +-
 criu/arch/ppc64/include/asm/restorer.h                                  | 2 +-
 criu/arch/x86/include/asm/restorer.h                                    | 2 +-
 criu/include/sigframe.h                                                 | 2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename {criu/arch/aarch64/include => compel/arch/aarch64/src/lib/include/uapi}/asm/sigframe.h (97%)
 rename {criu/arch/arm/include => compel/arch/arm/src/lib/include/uapi}/asm/sigframe.h (98%)
 rename {criu/arch/ppc64/include => compel/arch/ppc64/src/lib/include/uapi}/asm/sigframe.h (98%)
 rename {criu/arch/x86/include => compel/arch/x86/src/lib/include/uapi}/asm/sigframe.h (99%)
 rename {criu/include => compel/include/uapi}/sigframe-common.h (100%)

diff --git a/criu/arch/aarch64/include/asm/sigframe.h b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
similarity index 97%
rename from criu/arch/aarch64/include/asm/sigframe.h
rename to compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
index 3e8d63fb80eb..c890d10346ea 100644
--- a/criu/arch/aarch64/include/asm/sigframe.h
+++ b/compel/arch/aarch64/src/lib/include/uapi/asm/sigframe.h
@@ -21,7 +21,7 @@ struct aux_context {
 // XXX: the idetifier rt_sigcontext is expected to be struct by the CRIU code
 #define rt_sigcontext			sigcontext
 
-#include "sigframe-common.h"
+#include <compel/sigframe-common.h>
 
 /* Copied from the kernel source arch/arm64/kernel/signal.c */
 
diff --git a/criu/arch/arm/include/asm/sigframe.h b/compel/arch/arm/src/lib/include/uapi/asm/sigframe.h
similarity index 98%
rename from criu/arch/arm/include/asm/sigframe.h
rename to compel/arch/arm/src/lib/include/uapi/asm/sigframe.h
index c9433e07b142..65ae8a8b97c7 100644
--- a/criu/arch/arm/include/asm/sigframe.h
+++ b/compel/arch/arm/src/lib/include/uapi/asm/sigframe.h
@@ -51,7 +51,7 @@ struct aux_sigframe {
 	unsigned long		end_magic;
 } __attribute__((aligned(8)));
 
-#include "sigframe-common.h"
+#include <compel/sigframe-common.h>
 
 struct sigframe {
 	struct rt_ucontext	uc;
diff --git a/criu/arch/ppc64/include/asm/sigframe.h b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
similarity index 98%
rename from criu/arch/ppc64/include/asm/sigframe.h
rename to compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
index 498bf8a8ccca..bfaee8784e23 100644
--- a/criu/arch/ppc64/include/asm/sigframe.h
+++ b/compel/arch/ppc64/src/lib/include/uapi/asm/sigframe.h
@@ -17,7 +17,7 @@
 // XXX: the idetifier rt_sigcontext is expected to be struct by the CRIU code
 #define rt_sigcontext sigcontext
 
-#include "sigframe-common.h"
+#include <compel/sigframe-common.h>
 
 #define RT_SIGFRAME_OFFSET(rt_sigframe)	0
 
diff --git a/criu/arch/x86/include/asm/sigframe.h b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
similarity index 99%
rename from criu/arch/x86/include/asm/sigframe.h
rename to compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
index af2b67aca6a0..7a744acbaca6 100644
--- a/criu/arch/x86/include/asm/sigframe.h
+++ b/compel/arch/x86/src/lib/include/uapi/asm/sigframe.h
@@ -66,7 +66,7 @@ struct rt_sigcontext_32 {
 	uint32_t			cr2;
 };
 
-#include "sigframe-common.h"
+#include <compel/sigframe-common.h>
 
 /*
  * XXX: move declarations to generic sigframe.h or sigframe-compat.h
diff --git a/criu/include/sigframe-common.h b/compel/include/uapi/sigframe-common.h
similarity index 100%
rename from criu/include/sigframe-common.h
rename to compel/include/uapi/sigframe-common.h
diff --git a/criu/arch/aarch64/include/asm/restorer.h b/criu/arch/aarch64/include/asm/restorer.h
index b842a74ef0ef..b5dd42e54319 100644
--- a/criu/arch/aarch64/include/asm/restorer.h
+++ b/criu/arch/aarch64/include/asm/restorer.h
@@ -7,7 +7,7 @@
 #include "asm/types.h"
 #include "images/core.pb-c.h"
 
-#include "sigframe.h"
+#include <compel/asm/sigframe.h>
 
 #define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,		\
 			     thread_args, clone_restore_fn)			\
diff --git a/criu/arch/arm/include/asm/restorer.h b/criu/arch/arm/include/asm/restorer.h
index c3b65922212a..1515b069a8eb 100644
--- a/criu/arch/arm/include/asm/restorer.h
+++ b/criu/arch/arm/include/asm/restorer.h
@@ -4,7 +4,7 @@
 #include "asm/types.h"
 #include "images/core.pb-c.h"
 
-#include "sigframe.h"
+#include <compel/asm/sigframe.h>
 
 #define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid,	\
 			     thread_args, clone_restore_fn)		\
diff --git a/criu/arch/ppc64/include/asm/restorer.h b/criu/arch/ppc64/include/asm/restorer.h
index e99f2751b919..399bdfb52132 100644
--- a/criu/arch/ppc64/include/asm/restorer.h
+++ b/criu/arch/ppc64/include/asm/restorer.h
@@ -7,7 +7,7 @@
 #include "asm/types.h"
 #include "asm/infect-types.h"
 
-#include "sigframe.h"
+#include <compel/asm/sigframe.h>
 
 /*
  * Clone trampoline
diff --git a/criu/arch/x86/include/asm/restorer.h b/criu/arch/x86/include/asm/restorer.h
index ec0a9b9fe3dd..98e4be3ee18f 100644
--- a/criu/arch/x86/include/asm/restorer.h
+++ b/criu/arch/x86/include/asm/restorer.h
@@ -6,7 +6,7 @@
 #include "images/core.pb-c.h"
 #include <compel/plugins/std/syscall-codes.h>
 
-#include "sigframe.h"
+#include <compel/asm/sigframe.h>
 
 #ifdef CONFIG_COMPAT
 static inline void __always_unused __check_compat_sigset_t(void)
diff --git a/criu/include/sigframe.h b/criu/include/sigframe.h
index bdda22262a27..b63d9f0e53b0 100644
--- a/criu/include/sigframe.h
+++ b/criu/include/sigframe.h
@@ -5,7 +5,7 @@
 #ifndef __CR_SIGFRAME_H__
 #define __CR_SIGFRAME_H__
 
-#include "asm/sigframe.h"
+#include <compel/asm/sigframe.h>
 #include "images/core.pb-c.h"
 
 extern int construct_sigframe(struct rt_sigframe *sigframe,
-- 
2.7.4