diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-31 15:56:42 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-01 11:41:00 +0100 |
| commit | 604eb945508e32aeaf4dbfd5ffb5137de6223b38 (patch) | |
| tree | 9711eb5fd6441e42e9ef9d4c0c1a32b60ff84c44 /target/linux/generic/backport-4.9 | |
| parent | 9687cc855644e5649156e2a52ebca6fa61fc362f (diff) | |
| download | upstream-604eb945508e32aeaf4dbfd5ffb5137de6223b38.tar.gz upstream-604eb945508e32aeaf4dbfd5ffb5137de6223b38.tar.bz2 upstream-604eb945508e32aeaf4dbfd5ffb5137de6223b38.zip | |
kernel: bump 4.9 to 4.9.154
Refreshed all patches.
Adapted patches:
- 012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch
Compile-tested on: ar7
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.9')
| -rw-r--r-- | target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch | 10 | ||||
| -rw-r--r-- | target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch b/target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch index ccc7232751..4b22ca0e3f 100644 --- a/target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch +++ b/target/linux/generic/backport-4.9/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch @@ -84,10 +84,11 @@ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h -@@ -334,3 +334,28 @@ - * code - */ - #define uninitialized_var(x) x = x +@@ -338,3 +338,30 @@ + #if GCC_VERSION >= 50100 + #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1 + #endif ++ + +/* + * Turn individual warnings and errors on and off locally, depending @@ -113,6 +114,7 @@ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> +#else +#define __diag_GCC_8(s) +#endif ++ --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -578,4 +578,23 @@ static __always_inline void __write_once diff --git a/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch b/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch index 7c36a767c7..4b7e8ba75a 100644 --- a/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch +++ b/target/linux/generic/backport-4.9/021-bridge-multicast-to-unicast.patch @@ -51,7 +51,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue> #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c -@@ -174,6 +174,29 @@ out: +@@ -173,6 +173,29 @@ out: return p; } @@ -81,7 +81,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue> /* called under rcu_read_lock */ void br_flood(struct net_bridge *br, struct sk_buff *skb, enum br_pkt_type pkt_type, bool local_rcv, bool local_orig) -@@ -242,10 +265,20 @@ void br_multicast_flood(struct net_bridg +@@ -241,10 +264,20 @@ void br_multicast_flood(struct net_bridg rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) : NULL; |