From 217f0d868a64d29cde4c55d0e499c8082f357b96 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Mon, 28 May 2012 12:59:56 +1000
Subject: [PATCH] --- yaml --- r: 308486 b: refs/heads/master c:
 69ea6405980f217557b6a58f70ff60d8d88519a5 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/lib/strnlen_user.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c724af7beda3..b876b6271dd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e2aec873ad6d16538512dbb96853caa1fa076af
+refs/heads/master: 69ea6405980f217557b6a58f70ff60d8d88519a5
diff --git a/trunk/lib/strnlen_user.c b/trunk/lib/strnlen_user.c
index 90900ecfeb54..a28df5206d95 100644
--- a/trunk/lib/strnlen_user.c
+++ b/trunk/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
 
 /*