On Tuesday 17 June 2014 16:22:50 Catalin Marinas wrote:

On Sat, May 24, 2014 at 12:02:00AM -0700, Andrew Pinski wrote:

quoted

diff --git a/arch/arm64/include/uapi/asm/bitsperlong.h b/arch/arm64/include/uapi/asm/bitsperlong.h
index fce9c29..5e06c59 100644
--- a/arch/arm64/include/uapi/asm/bitsperlong.h
+++ b/arch/arm64/include/uapi/asm/bitsperlong.h

@@ -16,7 +16,12 @@
 #ifndef __ASM_BITSPERLONG_H
 #define __ASM_BITSPERLONG_H
 
-#define __BITS_PER_LONG 64
+/* Assuming __LP64__ will be defined for native ELF64's and not for ILP32. */
+#ifdef __LP64__
+# define __BITS_PER_LONG 64
+#else
+# define __BITS_PER_LONG 32
+#endif

I think it's enough to just define it for the __LP64__ case.

quoted

 #include <asm-generic/bitsperlong.h>

The asm-generic definition if 32 by default.

Andrew's version does seem more readable though, and is obviously correct.

	Arnd