remove extra definitions of U32_MAX

commit 04f9b74e4d96d349de12fdd4e6626af4a9f75e09 upstream.

Now that the definition is centralized in <linux/kernel.h>, the
definitions of U32_MAX (and related) elsewhere in the kernel can be
removed.

Signed-off-by: Alex Elder <elder@linaro.org>
Acked-by: Sage Weil <sage@inktank.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
index 55dc1b079ed6de6cab16f05ebaa6995e1b59b397..635a1425d3708ef3e334aa947c2c8d6fbb971b00 100644 (file)
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
@@ -1954,10 +1954,6 @@ 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)
 {
        if (get_inode_item_key_version(inode) == KEY_FORMAT_3_5)

diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index 27fe66a279b1e5aadb8b84e52973882df5cb25e3..a6ef9cc267ec2cfd3940bab1d8e4f7030e31ef7b 100644 (file)
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -8,25 +8,6 @@
 
 #include <linux/ceph/types.h>
 
-/* 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))
-#define        U64_MAX ((u64)(~0ULL))
-
-#define        S8_MAX  ((s8)(U8_MAX >> 1))
-#define        S16_MAX ((s16)(U16_MAX >> 1))
-#define        S32_MAX ((s32)(U32_MAX >> 1))
-#define        S64_MAX ((s64)(U64_MAX >> 1LL))
-
-#define        S8_MIN  ((s8)(-S8_MAX - 1))
-#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,
  *   void **p     pointer to position pointer

diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
index ffb2615d286fb69d97dbd0c0a0e6a6e8c0729067..86183c4e4fd54a231933e09bd3d0b62c8228699e 100644 (file)
--- a/net/ipv4/tcp_illinois.c
+++ b/net/ipv4/tcp_illinois.c
@@ -23,9 +23,6 @@
 #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