projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.107' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
parisc
/
include
/
asm
/
bitops.h
diff --git
a/arch/parisc/include/asm/bitops.h
b/arch/parisc/include/asm/bitops.h
index 8c9b631d2a783e8a9e7cf4041fb0d917da585d06..8c00e6c0626636ad4880c9044e3ce80c2a5db78d 100644
(file)
--- a/
arch/parisc/include/asm/bitops.h
+++ b/
arch/parisc/include/asm/bitops.h
@@
-6,7
+6,7
@@
#endif
#include <linux/compiler.h>
#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 <linux/atomic.h>
#include <asm/byteorder.h>
#include <linux/atomic.h>
@@
-16,6
+16,12
@@
* to include/asm-i386/bitops.h or kerneldoc
*/
* 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))
#define CHOP_SHIFTCOUNT(x) (((unsigned long) (x)) & (BITS_PER_LONG - 1))