[CRIU] [PATCH 60/78] compel: Move fpu.h into it

[Cyrill Gorcunov]

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 .../include => compel/arch/aarch64/src/lib/include/uapi}/asm/fpu.h     | 0
 .../arm/include => compel/arch/arm/src/lib/include/uapi}/asm/fpu.h     | 0
 .../include => compel/arch/ppc64/src/lib/include/uapi}/asm/fpu.h       | 0
 .../x86/include => compel/arch/x86/src/lib/include/uapi}/asm/fpu.h     | 0
 criu/arch/aarch64/restorer.c                                           | 2 +-
 criu/arch/arm/restorer.c                                               | 2 +-
 criu/arch/ppc64/crtools.c                                              | 2 +-
 criu/arch/ppc64/restorer.c                                             | 2 +-
 criu/arch/x86/cpu.c                                                    | 2 +-
 criu/arch/x86/crtools.c                                                | 2 +-
 criu/arch/x86/include/asm/restorer.h                                   | 2 +-
 criu/arch/x86/include/asm/sigframe.h                                   | 2 +-
 criu/arch/x86/infect.c                                                 | 3 ++-
 criu/arch/x86/restorer.c                                               | 2 +-
 criu/arch/x86/sigaction_compat.c                                       | 2 +-
 criu/include/restorer.h                                                | 2 +-
 16 files changed, 13 insertions(+), 12 deletions(-)
 rename {criu/arch/ppc64/include => compel/arch/aarch64/src/lib/include/uapi}/asm/fpu.h (100%)
 rename {criu/arch/arm/include => compel/arch/arm/src/lib/include/uapi}/asm/fpu.h (100%)
 rename {criu/arch/aarch64/include => compel/arch/ppc64/src/lib/include/uapi}/asm/fpu.h (100%)
 rename {criu/arch/x86/include => compel/arch/x86/src/lib/include/uapi}/asm/fpu.h (100%)

diff --git a/criu/arch/ppc64/include/asm/fpu.h b/compel/arch/aarch64/src/lib/include/uapi/asm/fpu.h
similarity index 100%
rename from criu/arch/ppc64/include/asm/fpu.h
rename to compel/arch/aarch64/src/lib/include/uapi/asm/fpu.h
diff --git a/criu/arch/arm/include/asm/fpu.h b/compel/arch/arm/src/lib/include/uapi/asm/fpu.h
similarity index 100%
rename from criu/arch/arm/include/asm/fpu.h
rename to compel/arch/arm/src/lib/include/uapi/asm/fpu.h
diff --git a/criu/arch/aarch64/include/asm/fpu.h b/compel/arch/ppc64/src/lib/include/uapi/asm/fpu.h
similarity index 100%
rename from criu/arch/aarch64/include/asm/fpu.h
rename to compel/arch/ppc64/src/lib/include/uapi/asm/fpu.h
diff --git a/criu/arch/x86/include/asm/fpu.h b/compel/arch/x86/src/lib/include/uapi/asm/fpu.h
similarity index 100%
rename from criu/arch/x86/include/asm/fpu.h
rename to compel/arch/x86/src/lib/include/uapi/asm/fpu.h
diff --git a/criu/arch/aarch64/restorer.c b/criu/arch/aarch64/restorer.c
index 884bbff419f3..d9fbeadd9554 100644
--- a/criu/arch/aarch64/restorer.c
+++ b/criu/arch/aarch64/restorer.c
@@ -6,7 +6,7 @@
 
 #include <compel/plugins/std/syscall.h>
 #include "log.h"
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
 #include "cpu.h"
 
 int restore_nonsigframe_gpregs(UserRegsEntry *r)
diff --git a/criu/arch/arm/restorer.c b/criu/arch/arm/restorer.c
index 33f7e062446f..73fa307d1de7 100644
--- a/criu/arch/arm/restorer.c
+++ b/criu/arch/arm/restorer.c
@@ -6,7 +6,7 @@
 
 #include <compel/plugins/std/syscall.h>
 #include "log.h"
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
 #include "cpu.h"
 
 int restore_nonsigframe_gpregs(UserArmRegsEntry *r)
diff --git a/criu/arch/ppc64/crtools.c b/criu/arch/ppc64/crtools.c
index cd4df64175f8..3d662542e8bc 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -6,7 +6,7 @@
 #include <sys/uio.h>
 
 #include "types.h"
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
 #include "asm/restorer.h"
 #include "asm/dump.h"
 
diff --git a/criu/arch/ppc64/restorer.c b/criu/arch/ppc64/restorer.c
index 4dda4bd1612d..7172e44c3d66 100644
--- a/criu/arch/ppc64/restorer.c
+++ b/criu/arch/ppc64/restorer.c
@@ -2,7 +2,7 @@
 
 #include "restorer.h"
 #include "asm/restorer.h"
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
 
 #include <compel/plugins/std/syscall.h>
 #include "log.h"
diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index 15b75111a7f9..5113a29b986a 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -9,7 +9,7 @@
 #include "bitops.h"
 #include "asm/types.h"
 #include "asm/cpu.h"
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
 #include <compel/cpu.h>
 
 #include "common/compiler.h"
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index 438b88f29770..a4982f777e1a 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -8,7 +8,7 @@
 #include "types.h"
 #include "asm/parasite-syscall.h"
 #include "asm/restorer.h"
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
 #include "asm/dump.h"
 
 #include "cr_options.h"
diff --git a/criu/arch/x86/include/asm/restorer.h b/criu/arch/x86/include/asm/restorer.h
index 3951e7cc0a3d..ec0a9b9fe3dd 100644
--- a/criu/arch/x86/include/asm/restorer.h
+++ b/criu/arch/x86/include/asm/restorer.h
@@ -2,7 +2,7 @@
 #define __CR_ASM_RESTORER_H__
 
 #include "asm/types.h"
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
 #include "images/core.pb-c.h"
 #include <compel/plugins/std/syscall-codes.h>
 
diff --git a/criu/arch/x86/include/asm/sigframe.h b/criu/arch/x86/include/asm/sigframe.h
index 65ffccb21c13..b86034bddf42 100644
--- a/criu/arch/x86/include/asm/sigframe.h
+++ b/criu/arch/x86/include/asm/sigframe.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
 
 #define SIGFRAME_MAX_OFFSET 8
 
diff --git a/criu/arch/x86/infect.c b/criu/arch/x86/infect.c
index cf92cd551bbd..31c8ef49cc29 100644
--- a/criu/arch/x86/infect.c
+++ b/criu/arch/x86/infect.c
@@ -5,7 +5,8 @@
 #include <sys/mman.h>
 #include <sys/user.h>
 
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
+
 #include "asm/cpu.h"
 #include "kerndat.h"
 
diff --git a/criu/arch/x86/restorer.c b/criu/arch/x86/restorer.c
index 01ed669e597c..050241cca8a2 100644
--- a/criu/arch/x86/restorer.c
+++ b/criu/arch/x86/restorer.c
@@ -4,7 +4,7 @@
 #include "types.h"
 #include "restorer.h"
 #include "asm/restorer.h"
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
 #include "asm/string.h"
 
 #include <compel/plugins/std/syscall.h>
diff --git a/criu/arch/x86/sigaction_compat.c b/criu/arch/x86/sigaction_compat.c
index af723469636f..076c014ef353 100644
--- a/criu/arch/x86/sigaction_compat.c
+++ b/criu/arch/x86/sigaction_compat.c
@@ -1,5 +1,5 @@
 #include "asm/restorer.h"
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
 #include "asm/string.h"
 
 #include <sys/mman.h>
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index cce099582895..1deff1e55979 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -8,7 +8,7 @@
 #include "types.h"
 #include "int.h"
 #include "common/compiler.h"
-#include "asm/fpu.h"
+#include <compel/asm/fpu.h>
 #include "lock.h"
 #include "util.h"
 #include "asm/restorer.h"
-- 
2.7.4