diff mbox

[1/3] conditionally define U32_MAX

Message ID 52E6DA7F.5050500@linaro.org
State New
Headers show

Commit Message

Alex Elder Jan. 27, 2014, 10:15 p.m. UTC 
-------- Original Message --------
Subject: [PATCH 1/3] conditionally define U32_MAX
Date: Thu, 26 Dec 2013 09:12:00 -0600
From: Alex Elder <alex.elder@linaro.org>
To: Sage Weil <sage@inktank.com>, David Miller <davem@davemloft.net>,
kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org,
kaber@trash.net, Al Viro <viro@ZenIV.linux.org.uk>, jeffm@suse.com,
Steven Rostedt <rostedt@goodmis.org>, Andrew Morton
<akpm@linux-foundation.org>, mst@redhat.com,  Ingo Molnar <mingo@kernel.org>

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>
---
 fs/reiserfs/reiserfs.h      |    2 ++
 include/linux/ceph/decode.h |    2 ++
 net/ipv4/tcp_illinois.c     |    2 ++
 3 files changed, 6 insertions(+)
diff mbox

Patch

diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
index f8adaee..66a2e83 100644
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
@@ -1958,7 +1958,9 @@  struct treepath var = {.path_length =
ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}
 #define MAX_US_INT 0xffff

 // reiserfs version 2 has max offset 60 bits. Version 1 - 32 bit offset
+#ifndef U32_MAX
 #define U32_MAX (~(__u32)0)
+#endif /* !U32_MAX */

 static inline loff_t max_reiserfs_offset(struct inode *inode)
 {
diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index 0442c3d..27fe66a 100644
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -10,6 +10,7 @@ 

 /* This seemed to be the easiest place to define these */

+#ifndef U32_MAX
 #define	U8_MAX	((u8)(~0U))
 #define	U16_MAX	((u16)(~0U))
 #define	U32_MAX	((u32)(~0U))
@@ -24,6 +25,7 @@ 
 #define	S16_MIN	((s16)(-S16_MAX - 1))
 #define	S32_MIN	((s32)(-S32_MAX - 1))
 #define	S64_MIN	((s64)(-S64_MAX - 1LL))
+#endif /* !U32_MAX */

 /*
  * in all cases,
diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
index 8a52099..f439472 100644
--- a/net/ipv4/tcp_illinois.c
+++ b/net/ipv4/tcp_illinois.c
@@ -23,7 +23,9 @@ 
 #define ALPHA_MIN	((3*ALPHA_SCALE)/10)	/* ~0.3 */
 #define ALPHA_MAX	(10*ALPHA_SCALE)	/* 10.0 */
 #define ALPHA_BASE	ALPHA_SCALE		/* 1.0 */
+#ifndef U32_MAX
 #define U32_MAX		((u32)~0U)
+#endif /* !U32_MAX */
 #define RTT_MAX		(U32_MAX / ALPHA_MAX)	/* 3.3 secs */

 #define BETA_SHIFT	6