aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Elder <alex.elder@linaro.org>2014-01-23 18:54:01 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-23 19:36:55 -0500
commit04f9b74e4d96d349de12fdd4e6626af4a9f75e09 (patch)
tree18e1f592ba52f2b991d5b08c59712511ae23c83d
parent89a0714106aac7309c7dfa0f004b39e1e89d2942 (diff)
remove extra definitions of U32_MAX
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>
-rw-r--r--fs/reiserfs/reiserfs.h4
-rw-r--r--include/linux/ceph/decode.h19
-rw-r--r--net/ipv4/tcp_illinois.c3
3 files changed, 0 insertions, 26 deletions
diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
index 66a2e832fa8d..dfb617b2bad2 100644
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
@@ -1958,10 +1958,6 @@ struct treepath var = {.path_length = ILLEGAL_PATH_ELEMENT_OFFSET, .reada = 0,}
1958#define MAX_US_INT 0xffff 1958#define MAX_US_INT 0xffff
1959 1959
1960// reiserfs version 2 has max offset 60 bits. Version 1 - 32 bit offset 1960// reiserfs version 2 has max offset 60 bits. Version 1 - 32 bit offset
1961#ifndef U32_MAX
1962#define U32_MAX (~(__u32)0)
1963#endif /* !U32_MAX */
1964
1965static inline loff_t max_reiserfs_offset(struct inode *inode) 1961static inline loff_t max_reiserfs_offset(struct inode *inode)
1966{ 1962{
1967 if (get_inode_item_key_version(inode) == KEY_FORMAT_3_5) 1963 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 27fe66a279b1..a6ef9cc267ec 100644
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -8,25 +8,6 @@
8 8
9#include <linux/ceph/types.h> 9#include <linux/ceph/types.h>
10 10
11/* This seemed to be the easiest place to define these */
12
13#ifndef U32_MAX
14#define U8_MAX ((u8)(~0U))
15#define U16_MAX ((u16)(~0U))
16#define U32_MAX ((u32)(~0U))
17#define U64_MAX ((u64)(~0ULL))
18
19#define S8_MAX ((s8)(U8_MAX >> 1))
20#define S16_MAX ((s16)(U16_MAX >> 1))
21#define S32_MAX ((s32)(U32_MAX >> 1))
22#define S64_MAX ((s64)(U64_MAX >> 1LL))
23
24#define S8_MIN ((s8)(-S8_MAX - 1))
25#define S16_MIN ((s16)(-S16_MAX - 1))
26#define S32_MIN ((s32)(-S32_MAX - 1))
27#define S64_MIN ((s64)(-S64_MAX - 1LL))
28#endif /* !U32_MAX */
29
30/* 11/*
31 * in all cases, 12 * in all cases,
32 * void **p pointer to position pointer 13 * void **p pointer to position pointer
diff --git a/net/ipv4/tcp_illinois.c b/net/ipv4/tcp_illinois.c
index f43947235b35..e498a62b8f97 100644
--- a/net/ipv4/tcp_illinois.c
+++ b/net/ipv4/tcp_illinois.c
@@ -23,9 +23,6 @@
23#define ALPHA_MIN ((3*ALPHA_SCALE)/10) /* ~0.3 */ 23#define ALPHA_MIN ((3*ALPHA_SCALE)/10) /* ~0.3 */
24#define ALPHA_MAX (10*ALPHA_SCALE) /* 10.0 */ 24#define ALPHA_MAX (10*ALPHA_SCALE) /* 10.0 */
25#define ALPHA_BASE ALPHA_SCALE /* 1.0 */ 25#define ALPHA_BASE ALPHA_SCALE /* 1.0 */
26#ifndef U32_MAX
27#define U32_MAX ((u32)~0U)
28#endif /* !U32_MAX */
29#define RTT_MAX (U32_MAX / ALPHA_MAX) /* 3.3 secs */ 26#define RTT_MAX (U32_MAX / ALPHA_MAX) /* 3.3 secs */
30 27
31#define BETA_SHIFT 6 28#define BETA_SHIFT 6