headers: types.h -- Move BITS_PER_LONG to own header

This diet types.h and allows to include BITS_PER_LONG
only where really needed. It makes BITS_PER_LONG definition
close to one used in kernel.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

arch/arm/include/asm/bitops.h

 #ifndef __CR_BITOPS_H__
 #define __CR_BITOPS_H__
 
+#include "asm/bitsperlong.h"
+
 #define DIV_ROUND_UP(n,d)	(((n) + (d) - 1) / (d))
-#define BITS_PER_LONG		(8 * sizeof(long))
 #define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_LONG)
 
 #define DECLARE_BITMAP(name, bits)		\

arch/arm/include/asm/bitsperlong.h

+#ifndef __CR_BITSPERLONG_H__
+#define __CR_BITSPERLONG_H__
+
+#define BITS_PER_LONG 32
+
+#endif /* __CR_BITSPERLONG_H__ */

arch/arm/include/asm/types.h

@@ -235,8 +235,6 @@ typedef uint32_t auxv_t;
 static inline void *decode_pointer(uint64_t v) { return (void*)(uint32_t)v; }
 static inline uint64_t encode_pointer(void *p) { return (uint32_t)p; }
 
-#define BITS_PER_LONG 32
-
 typedef struct {
 	struct user_vfp		ufp;
 	struct user_vfp_exc	ufp_exc;

arch/x86/include/asm/bitops.h

 #ifndef __CR_BITOPS_H__
 #define __CR_BITOPS_H__
 
+#include "asm/bitsperlong.h"
+
 #define DIV_ROUND_UP(n,d)	(((n) + (d) - 1) / (d))
-#define BITS_PER_LONG		(8 * sizeof(long))
 #define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_LONG)
 
 #define DECLARE_BITMAP(name, bits)		\

arch/x86/include/asm/bitsperlong.h

+#ifndef __CR_BITSPERLONG_H__
+#define __CR_BITSPERLONG_H__
+
+#ifdef CONFIG_X86_64
+# define BITS_PER_LONG 64
+#else
+# define BITS_PER_LONG 32
+#endif
+
+#endif /* __CR_BITSPERLONG_H__ */

arch/x86/include/asm/types.h

@@ -258,8 +258,6 @@ typedef uint64_t auxv_t;
 
 typedef UserX86RegsEntry UserRegsEntry;
 
-#define BITS_PER_LONG 64
-
 static inline uint64_t encode_pointer(void *p) { return (uint64_t)p; }
 static inline void *decode_pointer(uint64_t v) { return (void*)v; }
 

pie/log-simple.c

 #include <stdarg.h>
+
+#include "asm/bitsperlong.h"
+
 #include "syscall.h"
 #include "log.h"
 #include "log-levels.h"