diff --git a/[refs] b/[refs]
index c12462e338ef..7e0ca7172185 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a5a9906d4e8d1976b701f889d8f35d54b928f25
+refs/heads/master: 1de5b41cd3b2474c2770b825266d372073e1b28b
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 20a4fcf001ec..561db47ae041 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1455,9 +1455,15 @@ unsigned int full_name_hash(const unsigned char *name, unsigned int len)
 }
 EXPORT_SYMBOL(full_name_hash);
 
+#ifdef CONFIG_64BIT
 #define ONEBYTES	0x0101010101010101ul
 #define SLASHBYTES	0x2f2f2f2f2f2f2f2ful
 #define HIGHBITS	0x8080808080808080ul
+#else
+#define ONEBYTES	0x01010101ul
+#define SLASHBYTES	0x2f2f2f2ful
+#define HIGHBITS	0x80808080ul
+#endif
 
 /* Return the high bit set in the first byte that is a zero */
 static inline unsigned long has_zero(unsigned long a)