Browse Source

conditionally define U32_MAX

The symbol U32_MAX is defined in several spots.  Change these
definitions to be conditional.  This is in preparation for the next
patch, which centralizes the definition in <linux/kernel.h>.

Signed-off-by: Alex Elder <elder@linaro.org>
Cc: Sage Weil <sage@inktank.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Alex Elder 11 years ago
parent
commit
77719536dc
3 changed files with 6 additions and 0 deletions
  1. 2 0
      fs/reiserfs/reiserfs.h
  2. 2 0
      include/linux/ceph/decode.h
  3. 2 0
      net/ipv4/tcp_illinois.c

+ 2 - 0
fs/reiserfs/reiserfs.h

@@ -1958,7 +1958,9 @@ struct treepath var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}
 #define MAX_US_INT 0xffff
 #define MAX_US_INT 0xffff
 
 
 // reiserfs version 2 has max offset 60 bits. Version 1 - 32 bit offset
 // reiserfs version 2 has max offset 60 bits. Version 1 - 32 bit offset
+#ifndef U32_MAX
 #define U32_MAX (~(__u32)0)
 #define U32_MAX (~(__u32)0)
+#endif /* !U32_MAX */
 
 
 static inline loff_t max_reiserfs_offset(struct inode *inode)
 static inline loff_t max_reiserfs_offset(struct inode *inode)
 {
 {

+ 2 - 0
include/linux/ceph/decode.h

@@ -10,6 +10,7 @@
 
 
 /* This seemed to be the easiest place to define these */
 /* This seemed to be the easiest place to define these */
 
 
+#ifndef U32_MAX
 #define	U8_MAX	((u8)(~0U))
 #define	U8_MAX	((u8)(~0U))
 #define	U16_MAX	((u16)(~0U))
 #define	U16_MAX	((u16)(~0U))
 #define	U32_MAX	((u32)(~0U))
 #define	U32_MAX	((u32)(~0U))
@@ -24,6 +25,7 @@
 #define	S16_MIN	((s16)(-S16_MAX - 1))
 #define	S16_MIN	((s16)(-S16_MAX - 1))
 #define	S32_MIN	((s32)(-S32_MAX - 1))
 #define	S32_MIN	((s32)(-S32_MAX - 1))
 #define	S64_MIN	((s64)(-S64_MAX - 1LL))
 #define	S64_MIN	((s64)(-S64_MAX - 1LL))
+#endif /* !U32_MAX */
 
 
 /*
 /*
  * in all cases,
  * in all cases,

+ 2 - 0
net/ipv4/tcp_illinois.c

@@ -23,7 +23,9 @@
 #define ALPHA_MIN	((3*ALPHA_SCALE)/10)	/* ~0.3 */
 #define ALPHA_MIN	((3*ALPHA_SCALE)/10)	/* ~0.3 */
 #define ALPHA_MAX	(10*ALPHA_SCALE)	/* 10.0 */
 #define ALPHA_MAX	(10*ALPHA_SCALE)	/* 10.0 */
 #define ALPHA_BASE	ALPHA_SCALE		/* 1.0 */
 #define ALPHA_BASE	ALPHA_SCALE		/* 1.0 */
+#ifndef U32_MAX
 #define U32_MAX		((u32)~0U)
 #define U32_MAX		((u32)~0U)
+#endif /* !U32_MAX */
 #define RTT_MAX		(U32_MAX / ALPHA_MAX)	/* 3.3 secs */
 #define RTT_MAX		(U32_MAX / ALPHA_MAX)	/* 3.3 secs */
 
 
 #define BETA_SHIFT	6
 #define BETA_SHIFT	6