[CRIU] [PATCH] headers: Switch to common linkage.h
Cyrill Gorcunov
gorcunov at openvz.org
Thu Nov 10 02:34:18 PST 2016
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
compel/arch/aarch64/plugins/include/asm/linkage.h | 1 -
compel/arch/aarch64/plugins/std/syscalls/syscall-common.S | 2 +-
compel/arch/arm/plugins/include/asm/linkage.h | 1 -
compel/arch/arm/plugins/std/syscalls/syscall-common.S | 2 +-
compel/arch/ppc64/plugins/include/asm/linkage.h | 1 -
compel/arch/ppc64/plugins/std/syscalls/syscall-common-ppc64.S | 2 +-
compel/arch/x86/plugins/include/asm/linkage.h | 1 -
compel/arch/x86/plugins/std/prologue.S | 2 +-
compel/arch/x86/plugins/std/syscalls/syscall-common-x86-32.S | 2 +-
compel/arch/x86/plugins/std/syscalls/syscall-common-x86-64.S | 2 +-
criu/arch/aarch64/parasite-head.S | 2 +-
criu/arch/arm/parasite-head.S | 2 +-
criu/arch/ppc64/memcmp_64.S | 2 +-
criu/arch/ppc64/memcpy_power7.S | 2 +-
criu/arch/ppc64/parasite-head.S | 2 +-
criu/arch/ppc64/vdso-trampoline.S | 2 +-
criu/arch/x86/call32.S | 2 +-
criu/arch/x86/memcpy.S | 2 +-
criu/arch/x86/parasite-head-32.S | 2 +-
criu/arch/x86/parasite-head-64.S | 2 +-
{criu/arch/arm/include => include/common/arch/aarch64}/asm/linkage.h | 0
{criu/arch/aarch64/include => include/common/arch/arm}/asm/linkage.h | 0
{criu/arch/ppc64/include => include/common/arch/ppc64}/asm/linkage.h | 0
{criu/arch/x86/include => include/common/arch/x86}/asm/linkage.h | 0
24 files changed, 16 insertions(+), 20 deletions(-)
delete mode 120000 compel/arch/aarch64/plugins/include/asm/linkage.h
delete mode 120000 compel/arch/arm/plugins/include/asm/linkage.h
delete mode 120000 compel/arch/ppc64/plugins/include/asm/linkage.h
delete mode 120000 compel/arch/x86/plugins/include/asm/linkage.h
rename {criu/arch/arm/include => include/common/arch/aarch64}/asm/linkage.h (100%)
rename {criu/arch/aarch64/include => include/common/arch/arm}/asm/linkage.h (100%)
rename {criu/arch/ppc64/include => include/common/arch/ppc64}/asm/linkage.h (100%)
rename {criu/arch/x86/include => include/common/arch/x86}/asm/linkage.h (100%)
diff --git a/compel/arch/aarch64/plugins/include/asm/linkage.h b/compel/arch/aarch64/plugins/include/asm/linkage.h
deleted file mode 120000
index efec669844cf..000000000000
--- a/compel/arch/aarch64/plugins/include/asm/linkage.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../criu/arch/aarch64/include/asm/linkage.h
\ No newline at end of file
diff --git a/compel/arch/aarch64/plugins/std/syscalls/syscall-common.S b/compel/arch/aarch64/plugins/std/syscalls/syscall-common.S
index 81ec20f5516c..aeb89ea888c0 100644
--- a/compel/arch/aarch64/plugins/std/syscalls/syscall-common.S
+++ b/compel/arch/aarch64/plugins/std/syscalls/syscall-common.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
syscall_common:
svc #0
diff --git a/compel/arch/arm/plugins/include/asm/linkage.h b/compel/arch/arm/plugins/include/asm/linkage.h
deleted file mode 120000
index 9c421ec776ab..000000000000
--- a/compel/arch/arm/plugins/include/asm/linkage.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../criu/arch/arm/include/asm/linkage.h
\ No newline at end of file
diff --git a/compel/arch/arm/plugins/std/syscalls/syscall-common.S b/compel/arch/arm/plugins/std/syscalls/syscall-common.S
index 0e4367069451..9ac53bdd2854 100644
--- a/compel/arch/arm/plugins/std/syscalls/syscall-common.S
+++ b/compel/arch/arm/plugins/std/syscalls/syscall-common.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
@ We use the register R8 unlike libc that uses R12.
@ This avoids corruption of the register by the stub
diff --git a/compel/arch/ppc64/plugins/include/asm/linkage.h b/compel/arch/ppc64/plugins/include/asm/linkage.h
deleted file mode 120000
index da0a6b285afa..000000000000
--- a/compel/arch/ppc64/plugins/include/asm/linkage.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../criu/arch/ppc64/include/asm/linkage.h
\ No newline at end of file
diff --git a/compel/arch/ppc64/plugins/std/syscalls/syscall-common-ppc64.S b/compel/arch/ppc64/plugins/std/syscalls/syscall-common-ppc64.S
index e18d6adf419e..6d2a8d2854ef 100644
--- a/compel/arch/ppc64/plugins/std/syscalls/syscall-common-ppc64.S
+++ b/compel/arch/ppc64/plugins/std/syscalls/syscall-common-ppc64.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
#include <asm/unistd.h> /* for __NR_ipc */
#define SYSCALL(name, opcode) \
diff --git a/compel/arch/x86/plugins/include/asm/linkage.h b/compel/arch/x86/plugins/include/asm/linkage.h
deleted file mode 120000
index b1b2fe3ee342..000000000000
--- a/compel/arch/x86/plugins/include/asm/linkage.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../criu/arch/x86/include/asm/linkage.h
\ No newline at end of file
diff --git a/compel/arch/x86/plugins/std/prologue.S b/compel/arch/x86/plugins/std/prologue.S
index 62e51c64dc43..79ad1f6f2135 100644
--- a/compel/arch/x86/plugins/std/prologue.S
+++ b/compel/arch/x86/plugins/std/prologue.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
#include "asm/prologue.h"
#include "uapi/std/syscall-codes.h"
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall-common-x86-32.S b/compel/arch/x86/plugins/std/syscalls/syscall-common-x86-32.S
index ae6d594dc4fe..c1a7261234b2 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall-common-x86-32.S
+++ b/compel/arch/x86/plugins/std/syscalls/syscall-common-x86-32.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
#define SYSCALL(name, opcode) \
ENTRY(name); \
diff --git a/compel/arch/x86/plugins/std/syscalls/syscall-common-x86-64.S b/compel/arch/x86/plugins/std/syscalls/syscall-common-x86-64.S
index b93c31288a20..74465c3022e7 100644
--- a/compel/arch/x86/plugins/std/syscalls/syscall-common-x86-64.S
+++ b/compel/arch/x86/plugins/std/syscalls/syscall-common-x86-64.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
#define SYSCALL(name, opcode) \
ENTRY(name); \
diff --git a/criu/arch/aarch64/parasite-head.S b/criu/arch/aarch64/parasite-head.S
index 7a359061c4b9..7e82c43be483 100644
--- a/criu/arch/aarch64/parasite-head.S
+++ b/criu/arch/aarch64/parasite-head.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
#include "parasite.h"
.section .head.text, "ax"
diff --git a/criu/arch/arm/parasite-head.S b/criu/arch/arm/parasite-head.S
index 7b41f56dd9ef..77eef32c0b6e 100644
--- a/criu/arch/arm/parasite-head.S
+++ b/criu/arch/arm/parasite-head.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
#include "parasite.h"
.section .head.text, "ax"
diff --git a/criu/arch/ppc64/memcmp_64.S b/criu/arch/ppc64/memcmp_64.S
index 16c2b0cd8280..fd1bfb97ebd3 100644
--- a/criu/arch/ppc64/memcmp_64.S
+++ b/criu/arch/ppc64/memcmp_64.S
@@ -10,7 +10,7 @@
* --
* Copied form the linux file arch/powerpc/lib/memcmp_64.S
*/
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
#define off8 r6
#define off16 r7
diff --git a/criu/arch/ppc64/memcpy_power7.S b/criu/arch/ppc64/memcpy_power7.S
index a29d0e8f2ada..e66572324b02 100644
--- a/criu/arch/ppc64/memcpy_power7.S
+++ b/criu/arch/ppc64/memcpy_power7.S
@@ -21,7 +21,7 @@
* Copied from the kernel file arch/powerpc/lib/memcpy_power7.S
* Altivec support has been removed so we don't taint restored process.
*/
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
/*
* When building the parasite code, the compiler may rely on the C library
diff --git a/criu/arch/ppc64/parasite-head.S b/criu/arch/ppc64/parasite-head.S
index a1c189fe94ea..e24c338a3d09 100644
--- a/criu/arch/ppc64/parasite-head.S
+++ b/criu/arch/ppc64/parasite-head.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
#include "parasite.h"
.section .head.text
diff --git a/criu/arch/ppc64/vdso-trampoline.S b/criu/arch/ppc64/vdso-trampoline.S
index e910e7ab99a4..116fc3abbf23 100644
--- a/criu/arch/ppc64/vdso-trampoline.S
+++ b/criu/arch/ppc64/vdso-trampoline.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
.section .text
diff --git a/criu/arch/x86/call32.S b/criu/arch/x86/call32.S
index 935461dcdc86..48d28e2f1ba8 100644
--- a/criu/arch/x86/call32.S
+++ b/criu/arch/x86/call32.S
@@ -16,7 +16,7 @@
* the fly.
*/
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
#define __USER32_CS 0x23
#define __USER_CS 0x33
diff --git a/criu/arch/x86/memcpy.S b/criu/arch/x86/memcpy.S
index 3d6cb196b9ce..c8f7555fc2ea 100644
--- a/criu/arch/x86/memcpy.S
+++ b/criu/arch/x86/memcpy.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
/* The following code is taken from Linux kernel (arch/x86/lib/memcpy_64.S).
* There are 3 implementations in there, we use the one that relies on
diff --git a/criu/arch/x86/parasite-head-32.S b/criu/arch/x86/parasite-head-32.S
index 132d912bba86..50c032a902e1 100644
--- a/criu/arch/x86/parasite-head-32.S
+++ b/criu/arch/x86/parasite-head-32.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
#include "parasite.h"
.section .head.text, "ax"
diff --git a/criu/arch/x86/parasite-head-64.S b/criu/arch/x86/parasite-head-64.S
index 4cc4d920a2d3..bb6f95232b33 100644
--- a/criu/arch/x86/parasite-head-64.S
+++ b/criu/arch/x86/parasite-head-64.S
@@ -1,4 +1,4 @@
-#include "asm/linkage.h"
+#include "common/asm/linkage.h"
#include "parasite.h"
.section .head.text, "ax"
diff --git a/criu/arch/arm/include/asm/linkage.h b/include/common/arch/aarch64/asm/linkage.h
similarity index 100%
rename from criu/arch/arm/include/asm/linkage.h
rename to include/common/arch/aarch64/asm/linkage.h
diff --git a/criu/arch/aarch64/include/asm/linkage.h b/include/common/arch/arm/asm/linkage.h
similarity index 100%
rename from criu/arch/aarch64/include/asm/linkage.h
rename to include/common/arch/arm/asm/linkage.h
diff --git a/criu/arch/ppc64/include/asm/linkage.h b/include/common/arch/ppc64/asm/linkage.h
similarity index 100%
rename from criu/arch/ppc64/include/asm/linkage.h
rename to include/common/arch/ppc64/asm/linkage.h
diff --git a/criu/arch/x86/include/asm/linkage.h b/include/common/arch/x86/asm/linkage.h
similarity index 100%
rename from criu/arch/x86/include/asm/linkage.h
rename to include/common/arch/x86/asm/linkage.h
--
2.7.4
More information about the CRIU
mailing list