parisc: Don't use BITS_PER_LONG in userspace-exported swab.h header
authorHelge Deller <deller@gmx.de>
Sat, 28 Jan 2017 10:52:02 +0000 (11:52 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 16 Mar 2017 02:18:46 +0000 (02:18 +0000)
commitdc21ec8ca7f99f8bbc49c92c4b379732bf0327e2
tree3fbf344dd503e6fef52a4ce3a92af51a51d72172
parent2cd0304f853161b664bbf2f2f20d4e395b438bec
parisc: Don't use BITS_PER_LONG in userspace-exported swab.h header

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>
[bwh: Backported to 3.2: adjust filenames]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/parisc/include/asm/bitops.h
arch/parisc/include/asm/bitsperlong.h
arch/parisc/include/asm/swab.h