]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
fs/namei.c: fix warnings on 32-bit
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 21 Mar 2012 23:33:42 +0000 (16:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Mar 2012 00:54:54 +0000 (17:54 -0700)
i386 allnoconfig:

  fs/namei.c: In function 'has_zero':
  fs/namei.c:1617: warning: integer constant is too large for 'unsigned long' type
  fs/namei.c:1617: warning: integer constant is too large for 'unsigned long' type
  fs/namei.c: In function 'hash_name':
  fs/namei.c:1635: warning: integer constant is too large for 'unsigned long' type

There must be a tidier way of doing this.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/namei.c

index 20a4fcf001ece9b7e9d3b6be06e47a973ec1bc6b..561db47ae0414318a8c5f88b48dfeda757a29c30 100644 (file)
@@ -1455,9 +1455,15 @@ done:
 }
 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)