From: Greg Kroah-Hartman Date: Mon, 20 Apr 2015 19:16:26 +0000 (+0200) Subject: 3.10-stable patches X-Git-Tag: v4.0.1~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81edaba5fbc014b752dc407e94873fb0e03a18a4;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: conditionally-define-u32_max.patch remove-extra-definitions-of-u32_max.patch --- diff --git a/queue-3.10/conditionally-define-u32_max.patch b/queue-3.10/conditionally-define-u32_max.patch new file mode 100644 index 00000000000..66be6cada2d --- /dev/null +++ b/queue-3.10/conditionally-define-u32_max.patch @@ -0,0 +1,68 @@ +From 77719536dc00f8fd8f5abe6dadbde5331c37f996 Mon Sep 17 00:00:00 2001 +From: Alex Elder +Date: Thu, 23 Jan 2014 15:53:59 -0800 +Subject: conditionally define U32_MAX + +From: Alex Elder + +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 . + +Signed-off-by: Alex Elder +Cc: Sage Weil +Cc: David Miller +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + 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 diff --git a/queue-3.10/remove-extra-definitions-of-u32_max.patch b/queue-3.10/remove-extra-definitions-of-u32_max.patch new file mode 100644 index 00000000000..17e8d5d44bf --- /dev/null +++ b/queue-3.10/remove-extra-definitions-of-u32_max.patch @@ -0,0 +1,79 @@ +From 04f9b74e4d96d349de12fdd4e6626af4a9f75e09 Mon Sep 17 00:00:00 2001 +From: Alex Elder +Date: Thu, 23 Jan 2014 15:54:01 -0800 +Subject: remove extra definitions of U32_MAX + +From: Alex Elder + +commit 04f9b74e4d96d349de12fdd4e6626af4a9f75e09 upstream. + +Now that the definition is centralized in , the +definitions of U32_MAX (and related) elsewhere in the kernel can be +removed. + +Signed-off-by: Alex Elder +Acked-by: Sage Weil +Acked-by: David S. Miller +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/reiserfs/reiserfs.h | 4 ---- + include/linux/ceph/decode.h | 19 ------------------- + net/ipv4/tcp_illinois.c | 3 --- + 3 files changed, 26 deletions(-) + +--- a/fs/reiserfs/reiserfs.h ++++ b/fs/reiserfs/reiserfs.h +@@ -1954,10 +1954,6 @@ 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) + { + if (get_inode_item_key_version(inode) == KEY_FORMAT_3_5) +--- a/include/linux/ceph/decode.h ++++ b/include/linux/ceph/decode.h +@@ -8,25 +8,6 @@ + + #include + +-/* 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 +--- 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 diff --git a/queue-3.10/series b/queue-3.10/series new file mode 100644 index 00000000000..618c985cb2a --- /dev/null +++ b/queue-3.10/series @@ -0,0 +1,2 @@ +conditionally-define-u32_max.patch +remove-extra-definitions-of-u32_max.patch