Helge Deller
485f99073e
commit 2ad5d52d42810bed95100a3d912679d8864421ec upstream. In swab.h the "#if BITS_PER_LONG > 32" breaks compiling userspace programs if BITS_PER_LONG is #defined by userspace with the sizeof() compiler builtin. Solve this problem by using __BITS_PER_LONG instead. Since we now #include asm/bitsperlong.h avoid further potential userspace pollution by moving the #define of SHIFT_PER_LONG to bitops.h which is not exported to userspace. This patch unbreaks compiling qemu on hppa/parisc. Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Willy Tarreau <w@1wt.eu>
19 lines
443 B
C
19 lines
443 B
C
#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
|
|
#else
|
|
#define __BITS_PER_LONG 32
|
|
#endif
|
|
|
|
#include <asm-generic/bitsperlong.h>
|
|
|
|
#endif /* __ASM_PARISC_BITSPERLONG_H */
|