| From 77719536dc00f8fd8f5abe6dadbde5331c37f996 Mon Sep 17 00:00:00 2001 |
| From: Alex Elder <alex.elder@linaro.org> |
| Date: Thu, 23 Jan 2014 15:53:59 -0800 |
| Subject: conditionally define U32_MAX |
| |
| From: Alex Elder <alex.elder@linaro.org> |
| |
| commit 77719536dc00f8fd8f5abe6dadbde5331c37f996 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/reiserfs/reiserfs.h | 2 ++ |
| include/linux/ceph/decode.h | 2 ++ |
| net/ipv4/tcp_illinois.c | 2 ++ |
| 3 files changed, 6 insertions(+) |
| |
| --- a/fs/reiserfs/reiserfs.h |
| +++ b/fs/reiserfs/reiserfs.h |
| @@ -1954,7 +1954,9 @@ struct treepath var = {.path_length = IL |
| #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) |
| { |
| --- 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, |
| --- 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 |
