common: Move in bit operation helpers

travis-ci: success for Common headers
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>

criu/arch/aarch64/include/asm/types.h

@@ -7,7 +7,7 @@
 #include "images/core.pb-c.h"
 
 #include "asm/page.h"
-#include "asm/bitops.h"
+#include "bitops.h"
 #include "asm/int.h"
 
 

criu/arch/arm/include/asm/types.h

@@ -6,7 +6,7 @@
 #include "images/core.pb-c.h"
 
 #include "asm/page.h"
-#include "asm/bitops.h"
+#include "bitops.h"
 #include "asm/int.h"
 
 #define SIGMAX			64

criu/arch/ppc64/include/asm/types.h

@@ -6,7 +6,7 @@
 #include "images/core.pb-c.h"
 
 #include "asm/page.h"
-#include "asm/bitops.h"
+#include "bitops.h"
 #include "asm/int.h"
 
 /*

criu/arch/x86/cpu.c

@@ -6,7 +6,7 @@
 
 #include <sys/types.h>
 
-#include "asm/bitops.h"
+#include "bitops.h"
 #include "asm/types.h"
 #include "asm/cpu.h"
 #include "asm/fpu.h"

criu/arch/x86/include/asm/types.h

@@ -5,7 +5,7 @@
 #include <signal.h>
 
 #include "asm/page.h"
-#include "asm/bitops.h"
+#include "bitops.h"
 #include "asm/int.h"
 
 #include "images/core.pb-c.h"

criu/bitmap.c

@@ -1,4 +1,4 @@
-#include "bitsperlong.h"
+#include "common/bitsperlong.h"
 
 #define BIT_WORD(nr)		((nr) / BITS_PER_LONG)
 

criu/include/bitops.h

@@ -1,4 +1,4 @@
 #ifndef __CR_INC_BITOPS_H__
 #define __CR_INC_BITOPS_H__
-#include "asm/bitops.h"
+#include "common/bitops.h"
 #endif

criu/include/bitsperlong.h

@@ -1,4 +1,4 @@
 #ifndef __CR_INC_BITSPERLONG_H__
 #define __CR_INC_BITSPERLONG_H__
-#include "asm/bitsperlong.h"
+#include "common/bitsperlong.h"
 #endif

criu/pie/log-simple.c

@@ -2,7 +2,7 @@
 
 #include "int.h"
 #include "types.h"
-#include "bitsperlong.h"
+#include "common/bitsperlong.h"
 #include "syscall.h"
 #include "log.h"
 

include/common/arch/aarch64/asm/bitops.h

@@ -2,6 +2,6 @@
 #define __CR_ASM_BITOPS_H__
 
 #include "common/compiler.h"
-#include "asm-generic/bitops.h"
+#include "common/asm-generic/bitops.h"
 
 #endif /* __CR_ASM_BITOPS_H__ */

include/common/arch/arm/asm/bitops.h

@@ -2,6 +2,6 @@
 #define __CR_ASM_BITOPS_H__
 
 #include "common/compiler.h"
-#include "asm-generic/bitops.h"
+#include "common/asm-generic/bitops.h"
 
 #endif /* __CR_ASM_BITOPS_H__ */

include/common/arch/ppc64/asm/bitops.h

@@ -40,7 +40,7 @@
 
 #include "common/compiler.h"
 
-#include "asm/bitsperlong.h"
+#include "common/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)

include/common/arch/x86/asm/bitops.h

@@ -1,7 +1,7 @@
 #ifndef __CR_BITOPS_H__
 #define __CR_BITOPS_H__
 
-#include "asm/bitsperlong.h"
+#include "common/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)

include/common/bitops.h

@@ -0,0 +1,4 @@
+#ifndef __CR_COMMON_BITOPS_H__
+#define __CR_COMMON_BITOPS_H__
+#include "asm/bitops.h"
+#endif

include/common/bitsperlong.h

@@ -0,0 +1,4 @@
+#ifndef __CR_COMMON_BITSPERLONG_H__
+#define __CR_COMMON_BITSPERLONG_H__
+#include "asm/bitsperlong.h"
+#endif