[CRIU] [PATCH 33/38] compel: Move in bitops
Cyrill Gorcunov
gorcunov at openvz.org
Tue Oct 11 09:04:23 PDT 2016
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
.../arch/aarch64/src/lib/include/compel}/asm/bitops.h | 3 +--
.../arch/aarch64/src/lib/include/compel}/asm/bitsperlong.h | 0
.../include => compel/arch/arm/src/lib/include/compel}/asm/bitops.h | 3 +--
.../arch/arm/src/lib/include/compel}/asm/bitsperlong.h | 0
.../include => compel/arch/ppc64/src/lib/include/compel}/asm/bitops.h | 3 +--
.../arch/ppc64/src/lib/include/compel}/asm/bitsperlong.h | 0
.../include => compel/arch/x86/src/lib/include/compel}/asm/bitops.h | 3 ++-
.../arch/x86/src/lib/include/compel}/asm/bitsperlong.h | 0
{criu/include => compel/include/compel}/asm-generic/bitops.h | 3 ++-
criu/arch/aarch64/include/asm/types.h | 2 +-
criu/arch/arm/include/asm/types.h | 2 +-
criu/arch/ppc64/include/asm/types.h | 2 +-
criu/arch/x86/cpu.c | 2 +-
criu/arch/x86/include/asm/types.h | 2 +-
criu/bitmap.c | 2 +-
criu/cr-restore.c | 2 +-
criu/shmem.c | 2 +-
17 files changed, 15 insertions(+), 16 deletions(-)
rename {criu/arch/aarch64/include => compel/arch/aarch64/src/lib/include/compel}/asm/bitops.h (62%)
rename {criu/arch/ppc64/include => compel/arch/aarch64/src/lib/include/compel}/asm/bitsperlong.h (100%)
rename {criu/arch/arm/include => compel/arch/arm/src/lib/include/compel}/asm/bitops.h (62%)
rename {criu/arch/arm/include => compel/arch/arm/src/lib/include/compel}/asm/bitsperlong.h (100%)
rename {criu/arch/ppc64/include => compel/arch/ppc64/src/lib/include/compel}/asm/bitops.h (99%)
rename {criu/arch/aarch64/include => compel/arch/ppc64/src/lib/include/compel}/asm/bitsperlong.h (100%)
rename {criu/arch/x86/include => compel/arch/x86/src/lib/include/compel}/asm/bitops.h (97%)
rename {criu/arch/x86/include => compel/arch/x86/src/lib/include/compel}/asm/bitsperlong.h (100%)
rename {criu/include => compel/include/compel}/asm-generic/bitops.h (97%)
diff --git a/criu/arch/aarch64/include/asm/bitops.h b/compel/arch/aarch64/src/lib/include/compel/asm/bitops.h
similarity index 62%
rename from criu/arch/aarch64/include/asm/bitops.h
rename to compel/arch/aarch64/src/lib/include/compel/asm/bitops.h
index 5a750447f25f..fe19c4ca376a 100644
--- a/criu/arch/aarch64/include/asm/bitops.h
+++ b/compel/arch/aarch64/src/lib/include/compel/asm/bitops.h
@@ -1,7 +1,6 @@
#ifndef __CR_ASM_BITOPS_H__
#define __CR_ASM_BITOPS_H__
-#include "compiler.h"
-#include "asm-generic/bitops.h"
+#include "compel/asm-generic/bitops.h"
#endif /* __CR_ASM_BITOPS_H__ */
diff --git a/criu/arch/ppc64/include/asm/bitsperlong.h b/compel/arch/aarch64/src/lib/include/compel/asm/bitsperlong.h
similarity index 100%
rename from criu/arch/ppc64/include/asm/bitsperlong.h
rename to compel/arch/aarch64/src/lib/include/compel/asm/bitsperlong.h
diff --git a/criu/arch/arm/include/asm/bitops.h b/compel/arch/arm/src/lib/include/compel/asm/bitops.h
similarity index 62%
rename from criu/arch/arm/include/asm/bitops.h
rename to compel/arch/arm/src/lib/include/compel/asm/bitops.h
index 5a750447f25f..fe19c4ca376a 100644
--- a/criu/arch/arm/include/asm/bitops.h
+++ b/compel/arch/arm/src/lib/include/compel/asm/bitops.h
@@ -1,7 +1,6 @@
#ifndef __CR_ASM_BITOPS_H__
#define __CR_ASM_BITOPS_H__
-#include "compiler.h"
-#include "asm-generic/bitops.h"
+#include "compel/asm-generic/bitops.h"
#endif /* __CR_ASM_BITOPS_H__ */
diff --git a/criu/arch/arm/include/asm/bitsperlong.h b/compel/arch/arm/src/lib/include/compel/asm/bitsperlong.h
similarity index 100%
rename from criu/arch/arm/include/asm/bitsperlong.h
rename to compel/arch/arm/src/lib/include/compel/asm/bitsperlong.h
diff --git a/criu/arch/ppc64/include/asm/bitops.h b/compel/arch/ppc64/src/lib/include/compel/asm/bitops.h
similarity index 99%
rename from criu/arch/ppc64/include/asm/bitops.h
rename to compel/arch/ppc64/src/lib/include/compel/asm/bitops.h
index 910971981ca9..ba9a603bc99d 100644
--- a/criu/arch/ppc64/include/asm/bitops.h
+++ b/compel/arch/ppc64/src/lib/include/compel/asm/bitops.h
@@ -39,8 +39,7 @@
*/
#include "compiler.h"
-
-#include "asm/bitsperlong.h"
+#include "compel/asm/bitsperlong.h"
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_LONG)
diff --git a/criu/arch/aarch64/include/asm/bitsperlong.h b/compel/arch/ppc64/src/lib/include/compel/asm/bitsperlong.h
similarity index 100%
rename from criu/arch/aarch64/include/asm/bitsperlong.h
rename to compel/arch/ppc64/src/lib/include/compel/asm/bitsperlong.h
diff --git a/criu/arch/x86/include/asm/bitops.h b/compel/arch/x86/src/lib/include/compel/asm/bitops.h
similarity index 97%
rename from criu/arch/x86/include/asm/bitops.h
rename to compel/arch/x86/src/lib/include/compel/asm/bitops.h
index 7d6283183953..f12e40504485 100644
--- a/criu/arch/x86/include/asm/bitops.h
+++ b/compel/arch/x86/src/lib/include/compel/asm/bitops.h
@@ -1,7 +1,8 @@
#ifndef __CR_BITOPS_H__
#define __CR_BITOPS_H__
-#include "asm/bitsperlong.h"
+#include "compiler.h"
+#include "compel/asm/bitsperlong.h"
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_LONG)
diff --git a/criu/arch/x86/include/asm/bitsperlong.h b/compel/arch/x86/src/lib/include/compel/asm/bitsperlong.h
similarity index 100%
rename from criu/arch/x86/include/asm/bitsperlong.h
rename to compel/arch/x86/src/lib/include/compel/asm/bitsperlong.h
diff --git a/criu/include/asm-generic/bitops.h b/compel/include/compel/asm-generic/bitops.h
similarity index 97%
rename from criu/include/asm-generic/bitops.h
rename to compel/include/compel/asm-generic/bitops.h
index 190e1ab638c0..0d3b328c84a6 100644
--- a/criu/include/asm-generic/bitops.h
+++ b/compel/include/compel/asm-generic/bitops.h
@@ -8,7 +8,8 @@
#ifndef __CR_GENERIC_BITOPS_H__
#define __CR_GENERIC_BITOPS_H__
-#include "asm/bitsperlong.h"
+#include "compiler.h"
+#include "compel/asm/bitsperlong.h"
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_LONG)
diff --git a/criu/arch/aarch64/include/asm/types.h b/criu/arch/aarch64/include/asm/types.h
index 65b675f6996f..de86b8ca2297 100644
--- a/criu/arch/aarch64/include/asm/types.h
+++ b/criu/arch/aarch64/include/asm/types.h
@@ -6,7 +6,7 @@
#include <asm/ptrace.h>
#include "images/core.pb-c.h"
-#include "asm/bitops.h"
+#include "compel/asm/bitops.h"
#include "asm/int.h"
#include "uapi/std/asm/syscall-types.h"
diff --git a/criu/arch/arm/include/asm/types.h b/criu/arch/arm/include/asm/types.h
index 3aeb25f544c3..5acc86f5539a 100644
--- a/criu/arch/arm/include/asm/types.h
+++ b/criu/arch/arm/include/asm/types.h
@@ -5,7 +5,7 @@
#include <signal.h>
#include "images/core.pb-c.h"
-#include "asm/bitops.h"
+#include "compel/asm/bitops.h"
#include "asm/int.h"
#include "uapi/std/asm/syscall-types.h"
diff --git a/criu/arch/ppc64/include/asm/types.h b/criu/arch/ppc64/include/asm/types.h
index 68175f97d5d0..fd803370809f 100644
--- a/criu/arch/ppc64/include/asm/types.h
+++ b/criu/arch/ppc64/include/asm/types.h
@@ -5,7 +5,7 @@
#include <signal.h>
#include "images/core.pb-c.h"
-#include "asm/bitops.h"
+#include "compel/asm/bitops.h"
#include "asm/int.h"
#include "uapi/std/asm/syscall-types.h"
diff --git a/criu/arch/x86/cpu.c b/criu/arch/x86/cpu.c
index ac96888daa3e..6b870da3ea65 100644
--- a/criu/arch/x86/cpu.c
+++ b/criu/arch/x86/cpu.c
@@ -6,7 +6,7 @@
#include <sys/types.h>
-#include "asm/bitops.h"
+#include "compel/asm/bitops.h"
#include "asm/types.h"
#include "asm/cpu.h"
#include "compel/asm/fpu.h"
diff --git a/criu/arch/x86/include/asm/types.h b/criu/arch/x86/include/asm/types.h
index 14b0146a9ca4..d02fe2161e4f 100644
--- a/criu/arch/x86/include/asm/types.h
+++ b/criu/arch/x86/include/asm/types.h
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include <signal.h>
-#include "asm/bitops.h"
+#include "compel/asm/bitops.h"
#include "asm/int.h"
#include "uapi/std/asm/syscall-types.h"
diff --git a/criu/bitmap.c b/criu/bitmap.c
index 65a501e728cb..3c787b66038a 100644
--- a/criu/bitmap.c
+++ b/criu/bitmap.c
@@ -1,4 +1,4 @@
-#include "asm/bitsperlong.h"
+#include "compel/asm/bitsperlong.h"
#define BIT_WORD(nr) ((nr) / BITS_PER_LONG)
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index e5a00ee9dd92..d682891aaf3c 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -93,7 +93,7 @@
#include "asm/restore.h"
#include "asm/atomic.h"
-#include "asm/bitops.h"
+#include "compel/asm/bitops.h"
#include "asm/parasite-syscall.h"
#include "cr-errno.h"
diff --git a/criu/shmem.c b/criu/shmem.c
index ebd22ecb3b72..821718d66ead 100644
--- a/criu/shmem.c
+++ b/criu/shmem.c
@@ -17,7 +17,7 @@
#include "mem.h"
#include "config.h"
#include "uapi/std/syscall-codes.h"
-#include "asm/bitops.h"
+#include "compel/asm/bitops.h"
#include "criu-log.h"
#include "protobuf.h"
--
2.7.4
More information about the CRIU
mailing list