diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-01 12:55:09 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-01 12:55:09 -0800 |
| commit | c8da41f0dc8d6cf25494b8462bf5875bda2e3568 (patch) | |
| tree | 395862f05525f0f1ee87cb680891d1831f5cf021 /arch/parisc/include/asm/bitops.h | |
| parent | e9a82a4cbe64b78d72c3adaea73352d2b9bab895 (diff) | |
| parent | 6c1ed78cb07494c721e9849c92987d029a2e816f (diff) | |
Merge tag 'v4.4.46' into android-4.4.y
This is the 4.4.46 stable release
Diffstat (limited to 'arch/parisc/include/asm/bitops.h')
| -rw-r--r-- | arch/parisc/include/asm/bitops.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/bitops.h b/arch/parisc/include/asm/bitops.h index 3f9406d9b9d6..da87943328a5 100644 --- a/arch/parisc/include/asm/bitops.h +++ b/arch/parisc/include/asm/bitops.h @@ -6,7 +6,7 @@ #endif #include <linux/compiler.h> -#include <asm/types.h> /* for BITS_PER_LONG/SHIFT_PER_LONG */ +#include <asm/types.h> #include <asm/byteorder.h> #include <asm/barrier.h> #include <linux/atomic.h> @@ -17,6 +17,12 @@ * to include/asm-i386/bitops.h or kerneldoc */ +#if __BITS_PER_LONG == 64 +#define SHIFT_PER_LONG 6 +#else +#define SHIFT_PER_LONG 5 +#endif + #define CHOP_SHIFTCOUNT(x) (((unsigned long) (x)) & (BITS_PER_LONG - 1)) |