[CRIU] [PATCH 6/7] common: Move fpu.h in
Cyrill Gorcunov
gorcunov at openvz.org
Fri Oct 21 06:48:35 PDT 2016
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
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/restorer.c | 2 +-
criu/arch/x86/sigaction_compat.c | 2 +-
criu/include/fpu.h | 4 ++++
criu/include/restorer.h | 2 +-
{criu/arch/ppc64/include => include/common/arch/aarch64}/asm/fpu.h | 0
{criu/arch/arm/include => include/common/arch/arm}/asm/fpu.h | 0
{criu/arch/aarch64/include => include/common/arch/ppc64}/asm/fpu.h | 0
{criu/arch/x86/include => include/common/arch/x86}/asm/fpu.h | 0
include/common/asm | 1 +
16 files changed, 15 insertions(+), 10 deletions(-)
create mode 100644 criu/include/fpu.h
rename {criu/arch/ppc64/include => include/common/arch/aarch64}/asm/fpu.h (100%)
rename {criu/arch/arm/include => include/common/arch/arm}/asm/fpu.h (100%)
rename {criu/arch/aarch64/include => include/common/arch/ppc64}/asm/fpu.h (100%)
rename {criu/arch/x86/include => include/common/arch/x86}/asm/fpu.h (100%)
create mode 120000 include/common/asm
diff --git a/criu/arch/aarch64/restorer.c b/criu/arch/aarch64/restorer.c
index 8a206315ddc0..b6bd6fbb8286 100644
--- a/criu/arch/aarch64/restorer.c
+++ b/criu/arch/aarch64/restorer.c
@@ -6,7 +6,7 @@
#include "uapi/std/syscall.h"
#include "log.h"
-#include "asm/fpu.h"
+#include "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 ea9ae680547a..3e9472adda57 100644
--- a/criu/arch/arm/restorer.c
+++ b/criu/arch/arm/restorer.c
@@ -6,7 +6,7 @@
#include "uapi/std/syscall.h"
#include "log.h"
-#include "asm/fpu.h"
+#include "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 dd631f4f6d23..5142de89bd63 100644
--- a/criu/arch/ppc64/crtools.c
+++ b/criu/arch/ppc64/crtools.c
@@ -6,7 +6,7 @@
#include <sys/uio.h>
#include "asm/types.h"
-#include "asm/fpu.h"
+#include "fpu.h"
#include "asm/restorer.h"
#include "cr_options.h"
diff --git a/criu/arch/ppc64/restorer.c b/criu/arch/ppc64/restorer.c
index 3f0aff87a5d4..300539d841ef 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 "fpu.h"
#include "uapi/std/syscall.h"
#include "log.h"
diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index 1252f7f4c74f..2083f4619a24 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -9,7 +9,7 @@
#include "asm/bitops.h"
#include "asm/types.h"
#include "asm/cpu.h"
-#include "asm/fpu.h"
+#include "fpu.h"
#include "common/compiler.h"
diff --git a/criu/arch/x86/crtools.c b/criu/arch/x86/crtools.c
index b1068466e050..706367cbb362 100644
--- a/criu/arch/x86/crtools.c
+++ b/criu/arch/x86/crtools.c
@@ -10,7 +10,7 @@
#include "asm/parasite-syscall.h"
#include "asm/restorer.h"
#include "asm/types.h"
-#include "asm/fpu.h"
+#include "fpu.h"
#include "cr_options.h"
#include "common/compiler.h"
diff --git a/criu/arch/x86/include/asm/restorer.h b/criu/arch/x86/include/asm/restorer.h
index a10f3c9d9c88..69d39fa1f89b 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 "fpu.h"
#include "images/core.pb-c.h"
#include "uapi/std/syscall-codes.h"
diff --git a/criu/arch/x86/restorer.c b/criu/arch/x86/restorer.c
index 0c0725147250..531183a30ebc 100644
--- a/criu/arch/x86/restorer.c
+++ b/criu/arch/x86/restorer.c
@@ -3,7 +3,7 @@
#include "restorer.h"
#include "asm/restorer.h"
-#include "asm/fpu.h"
+#include "fpu.h"
#include "asm/string.h"
#include "uapi/std/syscall.h"
diff --git a/criu/arch/x86/sigaction_compat.c b/criu/arch/x86/sigaction_compat.c
index 214b2058bf63..88a9e8359834 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 "fpu.h"
#include "asm/string.h"
#include <sys/mman.h>
diff --git a/criu/include/fpu.h b/criu/include/fpu.h
new file mode 100644
index 000000000000..f15872380eea
--- /dev/null
+++ b/criu/include/fpu.h
@@ -0,0 +1,4 @@
+#ifndef __CR_INC_FPU_H__
+#define __CR_INC_FPU_H__
+#include "common/asm/fpu.h"
+#endif
diff --git a/criu/include/restorer.h b/criu/include/restorer.h
index 301e4d235430..c1c0500c73d7 100644
--- a/criu/include/restorer.h
+++ b/criu/include/restorer.h
@@ -6,7 +6,7 @@
#include <sys/resource.h>
#include "common/compiler.h"
-#include "asm/fpu.h"
+#include "fpu.h"
#include "lock.h"
#include "util.h"
#include "asm/restorer.h"
diff --git a/criu/arch/ppc64/include/asm/fpu.h b/include/common/arch/aarch64/asm/fpu.h
similarity index 100%
rename from criu/arch/ppc64/include/asm/fpu.h
rename to include/common/arch/aarch64/asm/fpu.h
diff --git a/criu/arch/arm/include/asm/fpu.h b/include/common/arch/arm/asm/fpu.h
similarity index 100%
rename from criu/arch/arm/include/asm/fpu.h
rename to include/common/arch/arm/asm/fpu.h
diff --git a/criu/arch/aarch64/include/asm/fpu.h b/include/common/arch/ppc64/asm/fpu.h
similarity index 100%
rename from criu/arch/aarch64/include/asm/fpu.h
rename to include/common/arch/ppc64/asm/fpu.h
diff --git a/criu/arch/x86/include/asm/fpu.h b/include/common/arch/x86/asm/fpu.h
similarity index 100%
rename from criu/arch/x86/include/asm/fpu.h
rename to include/common/arch/x86/asm/fpu.h
diff --git a/include/common/asm b/include/common/asm
new file mode 120000
index 000000000000..37e856e0efe9
--- /dev/null
+++ b/include/common/asm
@@ -0,0 +1 @@
+./arch/x86/asm
\ No newline at end of file
--
2.7.4
More information about the CRIU
mailing list