Commit c31ae4bb authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Arnd Bergmann

asm-generic: introduce asm/bitsperlong.h

This provides a reliable way for asm-generic/types.h and other
files to find out if it is running on a 32 or 64 bit platform.

We cannot use CONFIG_64BIT for this in headers that are included
from user space because CONFIG symbols are not available there.
We also cannot do it inside of asm/types.h because some headers
need the word size but cannot include types.h.

The solution is to introduce a new header <asm/bitsperlong.h>
that defines both __BITS_PER_LONG for user space and
BITS_PER_LONG for usage in the kernel. The asm-generic
version falls back to 32 bit unless the architecture overrides
it, which I did for all 64 bit platforms.
Signed-off-by: default avatarRemis Lima Baima <remis.developer@googlemail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 63b852a6
#ifndef __ASM_ALPHA_BITSPERLONG_H
#define __ASM_ALPHA_BITSPERLONG_H
#define __BITS_PER_LONG 64
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_ALPHA_BITSPERLONG_H */
...@@ -25,9 +25,6 @@ typedef unsigned int umode_t; ...@@ -25,9 +25,6 @@ typedef unsigned int umode_t;
* These aren't exported outside the kernel to avoid name space clashes * These aren't exported outside the kernel to avoid name space clashes
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#define BITS_PER_LONG 64
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
typedef u64 dma_addr_t; typedef u64 dma_addr_t;
......
#include <asm-generic/bitsperlong.h>
#include <asm-generic/bitsperlong.h>
#include <asm-generic/bitsperlong.h>
#include <asm-generic/bitsperlong.h>
#include <asm-generic/bitsperlong.h>
#include <asm-generic/bitsperlong.h>
#ifndef __ASM_IA64_BITSPERLONG_H
#define __ASM_IA64_BITSPERLONG_H
#define __BITS_PER_LONG 64
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_IA64_BITSPERLONG_H */
...@@ -19,10 +19,6 @@ ...@@ -19,10 +19,6 @@
# define __IA64_UL(x) (x) # define __IA64_UL(x) (x)
# define __IA64_UL_CONST(x) x # define __IA64_UL_CONST(x) x
# ifdef __KERNEL__
# define BITS_PER_LONG 64
# endif
#else #else
# define __IA64_UL(x) ((unsigned long)(x)) # define __IA64_UL(x) ((unsigned long)(x))
# define __IA64_UL_CONST(x) x##UL # define __IA64_UL_CONST(x) x##UL
...@@ -34,10 +30,7 @@ typedef unsigned int umode_t; ...@@ -34,10 +30,7 @@ typedef unsigned int umode_t;
*/ */
# ifdef __KERNEL__ # ifdef __KERNEL__
#define BITS_PER_LONG 64
/* DMA addresses are 64-bits wide, in general. */ /* DMA addresses are 64-bits wide, in general. */
typedef u64 dma_addr_t; typedef u64 dma_addr_t;
# endif /* __KERNEL__ */ # endif /* __KERNEL__ */
......
#include <asm-generic/bitsperlong.h>
#include <asm-generic/bitsperlong.h>
#include <asm-generic/bitsperlong.h>
#ifndef __ASM_MIPS_BITSPERLONG_H
#define __ASM_MIPS_BITSPERLONG_H
#define __BITS_PER_LONG _MIPS_SZLONG
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_MIPS_BITSPERLONG_H */
...@@ -31,9 +31,6 @@ typedef unsigned short umode_t; ...@@ -31,9 +31,6 @@ typedef unsigned short umode_t;
* These aren't exported outside the kernel to avoid name space clashes * These aren't exported outside the kernel to avoid name space clashes
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#define BITS_PER_LONG _MIPS_SZLONG
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \ #if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
......
#include <asm-generic/bitsperlong.h>
#ifndef __ASM_PARISC_BITSPERLONG_H
#define __ASM_PARISC_BITSPERLONG_H
/*
* using CONFIG_* outside of __KERNEL__ is wrong,
* __LP64__ was also removed from headers, so what
* is the right approach on parisc?
* -arnd
*/
#if (defined(__KERNEL__) && defined(CONFIG_64BIT)) || defined (__LP64__)
#define __BITS_PER_LONG 64
#define SHIFT_PER_LONG 6
#else
#define __BITS_PER_LONG 32
#define SHIFT_PER_LONG 5
#endif
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_PARISC_BITSPERLONG_H */
...@@ -14,14 +14,6 @@ typedef unsigned short umode_t; ...@@ -14,14 +14,6 @@ typedef unsigned short umode_t;
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_64BIT
#define BITS_PER_LONG 64
#define SHIFT_PER_LONG 6
#else
#define BITS_PER_LONG 32
#define SHIFT_PER_LONG 5
#endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* Dma addresses are 32-bits wide. */ /* Dma addresses are 32-bits wide. */
......
#ifndef __ASM_POWERPC_BITSPERLONG_H
#define __ASM_POWERPC_BITSPERLONG_H
#if defined(__powerpc64__)
# define __BITS_PER_LONG 64
#else
# define __BITS_PER_LONG 32
#endif
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_POWERPC_BITSPERLONG_H */
...@@ -40,15 +40,6 @@ typedef struct { ...@@ -40,15 +40,6 @@ typedef struct {
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#ifdef __KERNEL__ #ifdef __KERNEL__
/*
* These aren't exported outside the kernel to avoid name space clashes
*/
#ifdef __powerpc64__
#define BITS_PER_LONG 64
#else
#define BITS_PER_LONG 32
#endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
typedef __vector128 vector128; typedef __vector128 vector128;
......
#ifndef __ASM_S390_BITSPERLONG_H
#define __ASM_S390_BITSPERLONG_H
#ifndef __s390x__
#define __BITS_PER_LONG 32
#else
#define __BITS_PER_LONG 64
#endif
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_S390_BITSPERLONG_H */
...@@ -28,12 +28,6 @@ typedef __signed__ long saddr_t; ...@@ -28,12 +28,6 @@ typedef __signed__ long saddr_t;
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifndef __s390x__
#define BITS_PER_LONG 32
#else
#define BITS_PER_LONG 64
#endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
typedef u64 dma64_addr_t; typedef u64 dma64_addr_t;
......
#include <asm-generic/bitsperlong.h>
#ifndef __ASM_ALPHA_BITSPERLONG_H
#define __ASM_ALPHA_BITSPERLONG_H
#if defined(__sparc__) && defined(__arch64__)
#define __BITS_PER_LONG 64
#else
#define __BITS_PER_LONG 32
#endif
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_ALPHA_BITSPERLONG_H */
...@@ -21,8 +21,6 @@ typedef unsigned short umode_t; ...@@ -21,8 +21,6 @@ typedef unsigned short umode_t;
#ifdef __KERNEL__ #ifdef __KERNEL__
#define BITS_PER_LONG 64
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* Dma addresses come in generic and 64-bit flavours. */ /* Dma addresses come in generic and 64-bit flavours. */
...@@ -46,8 +44,6 @@ typedef unsigned short umode_t; ...@@ -46,8 +44,6 @@ typedef unsigned short umode_t;
#ifdef __KERNEL__ #ifdef __KERNEL__
#define BITS_PER_LONG 32
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
......
#ifndef __ASM_X86_BITSPERLONG_H
#define __ASM_X86_BITSPERLONG_H
#ifdef __x86_64__
# define __BITS_PER_LONG 64
#else
# define __BITS_PER_LONG 32
#endif
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_X86_BITSPERLONG_H */
...@@ -14,12 +14,6 @@ typedef unsigned short umode_t; ...@@ -14,12 +14,6 @@ typedef unsigned short umode_t;
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_X86_32
# define BITS_PER_LONG 32
#else
# define BITS_PER_LONG 64
#endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
typedef u64 dma64_addr_t; typedef u64 dma64_addr_t;
......
#include <asm-generic/bitsperlong.h>
header-y += bitsperlong.h
header-y += errno-base.h header-y += errno-base.h
header-y += errno.h header-y += errno.h
header-y += fcntl.h header-y += fcntl.h
......
...@@ -9,6 +9,7 @@ unifdef-y += a.out.h ...@@ -9,6 +9,7 @@ unifdef-y += a.out.h
endif endif
unifdef-y += auxvec.h unifdef-y += auxvec.h
unifdef-y += byteorder.h unifdef-y += byteorder.h
unifdef-y += bitsperlong.h
unifdef-y += errno.h unifdef-y += errno.h
unifdef-y += fcntl.h unifdef-y += fcntl.h
unifdef-y += ioctl.h unifdef-y += ioctl.h
......
#ifndef __ASM_GENERIC_BITS_PER_LONG
#define __ASM_GENERIC_BITS_PER_LONG
/*
* There seems to be no way of detecting this automatically from user
* space, so 64 bit architectures should override this in their
* bitsperlong.h. In particular, an architecture that supports
* both 32 and 64 bit user space must not rely on CONFIG_64BIT
* to decide it, but rather check a compiler provided macro.
*/
#ifndef __BITS_PER_LONG
#define __BITS_PER_LONG 32
#endif
#ifdef __KERNEL__
#ifdef CONFIG_64BIT
#define BITS_PER_LONG 64
#else
#define BITS_PER_LONG 32
#endif /* CONFIG_64BIT */
/*
* FIXME: The check currently breaks x86-64 build, so it's
* temporarily disabled. Please fix x86-64 and reenable
*/
#if 0 && BITS_PER_LONG != __BITS_PER_LONG
#error Inconsistent word size. Check asm/bitsperlong.h
#endif
#endif /* __KERNEL__ */
#endif /* __ASM_GENERIC_BITS_PER_LONG */
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#ifndef _ASM_GENERIC_INT_L64_H #ifndef _ASM_GENERIC_INT_L64_H
#define _ASM_GENERIC_INT_L64_H #define _ASM_GENERIC_INT_L64_H
#include <asm/bitsperlong.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* /*
* __xx is ok: it doesn't pollute the POSIX namespace. Use these in the * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#ifndef _ASM_GENERIC_INT_LL64_H #ifndef _ASM_GENERIC_INT_LL64_H
#define _ASM_GENERIC_INT_LL64_H #define _ASM_GENERIC_INT_LL64_H
#include <asm/bitsperlong.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
/* /*
* __xx is ok: it doesn't pollute the POSIX namespace. Use these in the * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment