Merge branch '3.5-merge-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab...

[deliverable/linux.git] / lib / strnlen_user.c

diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
index 90900ecfeb542f361dd0785b99f746f0a8c4ed23..a28df5206d95c24d6f3b4116753747f1fb2a67e3 100644 (file)
--- a/lib/strnlen_user.c
+++ b/lib/strnlen_user.c
@@ -8,7 +8,7 @@
 #ifdef __LITTLE_ENDIAN
 #  define aligned_byte_mask(n) ((1ul << 8*(n))-1)
 #else
-#  define aligned_byte_mask(n) (~0xfful << 8*(7-(n)))
+#  define aligned_byte_mask(n) (~0xfful << (BITS_PER_LONG - 8 - 8*(n)))
 #endif
 
 /*