diff options
| author | Helge Deller <deller@gmx.de> | 2017-01-28 11:52:02 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2017-01-28 21:54:23 +0100 |
| commit | 2ad5d52d42810bed95100a3d912679d8864421ec (patch) | |
| tree | 7f93e2f906b1c86f5b76c0f4c0978d41a8a29861 /arch/parisc/include/uapi/asm/bitsperlong.h | |
| parent | 83b5d1e3d3013dbf90645a5d07179d018c8243fa (diff) | |
| download | linux-stable-2ad5d52d42810bed95100a3d912679d8864421ec.tar.gz linux-stable-2ad5d52d42810bed95100a3d912679d8864421ec.tar.bz2 linux-stable-2ad5d52d42810bed95100a3d912679d8864421ec.zip | |
parisc: Don't use BITS_PER_LONG in userspace-exported swab.h header
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>
Cc: <stable@vger.kernel.org>
Diffstat (limited to 'arch/parisc/include/uapi/asm/bitsperlong.h')
| -rw-r--r-- | arch/parisc/include/uapi/asm/bitsperlong.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/include/uapi/asm/bitsperlong.h b/arch/parisc/include/uapi/asm/bitsperlong.h index e0a23c7bdd43..07fa7e50bdc0 100644 --- a/arch/parisc/include/uapi/asm/bitsperlong.h +++ b/arch/parisc/include/uapi/asm/bitsperlong.h @@ -3,10 +3,8 @@ #if 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> |