[PATCH 1/4] X86: Move BITS_PER_LONG definition to types.h

Sascha Hauer s.hauer at pengutronix.de
Wed Jul 16 01:37:50 PDT 2014


Because that's where it belongs.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/x86/include/asm/bitops.h | 2 --
 arch/x86/include/asm/types.h  | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index d741e44..e525812 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -23,8 +23,6 @@
 #ifndef _ASM_X86_BITOPS_H_
 #define _ASM_X86_BITOPS_H_
 
-#define BITS_PER_LONG 32
-
 #include <asm-generic/bitops/__fls.h>
 #include <asm-generic/bitops/__ffs.h>
 #include <asm-generic/bitops/fls.h>
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
index d473405..b3fd1f6 100644
--- a/arch/x86/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
@@ -41,6 +41,8 @@ typedef unsigned int u32;
 typedef signed long long s64;
 typedef unsigned long long u64;
 
+#define BITS_PER_LONG 32
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __ASM_X86_TYPES_H */
-- 
2.0.1




More information about the barebox mailing list