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>
This commit is contained in:
parent
9687cc8556
commit
604eb94550
@ -3,12 +3,12 @@
|
|||||||
LINUX_RELEASE?=1
|
LINUX_RELEASE?=1
|
||||||
|
|
||||||
LINUX_VERSION-3.18 = .133
|
LINUX_VERSION-3.18 = .133
|
||||||
LINUX_VERSION-4.9 = .153
|
LINUX_VERSION-4.9 = .154
|
||||||
LINUX_VERSION-4.14 = .96
|
LINUX_VERSION-4.14 = .96
|
||||||
LINUX_VERSION-4.19 = .18
|
LINUX_VERSION-4.19 = .18
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-3.18.133 = 3ec7f47365a8a050e629a5016e90e38a800e840c844901c979e9e796f8dc6711
|
LINUX_KERNEL_HASH-3.18.133 = 3ec7f47365a8a050e629a5016e90e38a800e840c844901c979e9e796f8dc6711
|
||||||
LINUX_KERNEL_HASH-4.9.153 = 9066929ec2550794ae107350a5f3c5b648438aa915cfc62bac5b7a54b9d7731a
|
LINUX_KERNEL_HASH-4.9.154 = 5b314f1ac16f78e10acea0053f0c758e696b28f80272064e0a06bc69dc9d5696
|
||||||
LINUX_KERNEL_HASH-4.14.96 = 110daeae1a416b7e0ec8dce5e86d67552deeb4567f696c3869389be239f0ecb5
|
LINUX_KERNEL_HASH-4.14.96 = 110daeae1a416b7e0ec8dce5e86d67552deeb4567f696c3869389be239f0ecb5
|
||||||
LINUX_KERNEL_HASH-4.19.18 = 5ffdc068f9bf768b7cd5a8a2271d1370c2326e967848b13e21dfdbb1ef0ff3f1
|
LINUX_KERNEL_HASH-4.19.18 = 5ffdc068f9bf768b7cd5a8a2271d1370c2326e967848b13e21dfdbb1ef0ff3f1
|
||||||
|
|
||||||
|
@ -84,10 +84,11 @@ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
|
|||||||
|
|
||||||
--- a/include/linux/compiler-gcc.h
|
--- a/include/linux/compiler-gcc.h
|
||||||
+++ b/include/linux/compiler-gcc.h
|
+++ b/include/linux/compiler-gcc.h
|
||||||
@@ -334,3 +334,28 @@
|
@@ -338,3 +338,30 @@
|
||||||
* code
|
#if GCC_VERSION >= 50100
|
||||||
*/
|
#define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
|
||||||
#define uninitialized_var(x) x = x
|
#endif
|
||||||
|
+
|
||||||
+
|
+
|
||||||
+/*
|
+/*
|
||||||
+ * Turn individual warnings and errors on and off locally, depending
|
+ * Turn individual warnings and errors on and off locally, depending
|
||||||
@ -113,6 +114,7 @@ Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
|
|||||||
+#else
|
+#else
|
||||||
+#define __diag_GCC_8(s)
|
+#define __diag_GCC_8(s)
|
||||||
+#endif
|
+#endif
|
||||||
|
+
|
||||||
--- a/include/linux/compiler.h
|
--- a/include/linux/compiler.h
|
||||||
+++ b/include/linux/compiler.h
|
+++ b/include/linux/compiler.h
|
||||||
@@ -578,4 +578,23 @@ static __always_inline void __write_once
|
@@ -578,4 +578,23 @@ static __always_inline void __write_once
|
||||||
|
@ -51,7 +51,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
|
|||||||
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
|
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
|
||||||
--- a/net/bridge/br_forward.c
|
--- a/net/bridge/br_forward.c
|
||||||
+++ b/net/bridge/br_forward.c
|
+++ b/net/bridge/br_forward.c
|
||||||
@@ -174,6 +174,29 @@ out:
|
@@ -173,6 +173,29 @@ out:
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -81,7 +81,7 @@ Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
|
|||||||
/* called under rcu_read_lock */
|
/* called under rcu_read_lock */
|
||||||
void br_flood(struct net_bridge *br, struct sk_buff *skb,
|
void br_flood(struct net_bridge *br, struct sk_buff *skb,
|
||||||
enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)
|
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) :
|
rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
|
||||||
NULL;
|
NULL;
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/net/bridge/br_forward.c
|
--- a/net/bridge/br_forward.c
|
||||||
+++ b/net/bridge/br_forward.c
|
+++ b/net/bridge/br_forward.c
|
||||||
@@ -141,6 +141,9 @@ static int deliver_clone(const struct ne
|
@@ -140,6 +140,9 @@ static int deliver_clone(const struct ne
|
||||||
void br_forward(const struct net_bridge_port *to,
|
void br_forward(const struct net_bridge_port *to,
|
||||||
struct sk_buff *skb, bool local_rcv, bool local_orig)
|
struct sk_buff *skb, bool local_rcv, bool local_orig)
|
||||||
{
|
{
|
||||||
@ -35,7 +35,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
if (to && should_deliver(to, skb)) {
|
if (to && should_deliver(to, skb)) {
|
||||||
if (local_rcv)
|
if (local_rcv)
|
||||||
deliver_clone(to, skb, local_orig);
|
deliver_clone(to, skb, local_orig);
|
||||||
@@ -206,6 +209,8 @@ void br_flood(struct net_bridge *br, str
|
@@ -205,6 +208,8 @@ void br_flood(struct net_bridge *br, str
|
||||||
struct net_bridge_port *p;
|
struct net_bridge_port *p;
|
||||||
|
|
||||||
list_for_each_entry_rcu(p, &br->port_list, list) {
|
list_for_each_entry_rcu(p, &br->port_list, list) {
|
||||||
|
@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
device, it has to decide which ones to send first, which ones to
|
device, it has to decide which ones to send first, which ones to
|
||||||
--- a/net/sched/sch_api.c
|
--- a/net/sched/sch_api.c
|
||||||
+++ b/net/sched/sch_api.c
|
+++ b/net/sched/sch_api.c
|
||||||
@@ -1978,7 +1978,7 @@ static int __init pktsched_init(void)
|
@@ -1977,7 +1977,7 @@ static int __init pktsched_init(void)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -339,7 +339,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/net/ipv4/fib_trie.c
|
--- a/net/ipv4/fib_trie.c
|
||||||
+++ b/net/ipv4/fib_trie.c
|
+++ b/net/ipv4/fib_trie.c
|
||||||
@@ -2667,10 +2667,12 @@ static const struct file_operations fib_
|
@@ -2677,10 +2677,12 @@ static const struct file_operations fib_
|
||||||
|
|
||||||
int __net_init fib_proc_init(struct net *net)
|
int __net_init fib_proc_init(struct net *net)
|
||||||
{
|
{
|
||||||
@ -354,7 +354,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
&fib_triestat_fops))
|
&fib_triestat_fops))
|
||||||
goto out2;
|
goto out2;
|
||||||
|
|
||||||
@@ -2680,17 +2682,21 @@ int __net_init fib_proc_init(struct net
|
@@ -2690,17 +2692,21 @@ int __net_init fib_proc_init(struct net
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out3:
|
out3:
|
||||||
|
@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
static void rt_fibinfo_free(struct rtable __rcu **rtp)
|
static void rt_fibinfo_free(struct rtable __rcu **rtp)
|
||||||
--- a/net/ipv4/fib_trie.c
|
--- a/net/ipv4/fib_trie.c
|
||||||
+++ b/net/ipv4/fib_trie.c
|
+++ b/net/ipv4/fib_trie.c
|
||||||
@@ -2396,6 +2396,7 @@ static const char *const rtn_type_names[
|
@@ -2406,6 +2406,7 @@ static const char *const rtn_type_names[
|
||||||
[RTN_THROW] = "THROW",
|
[RTN_THROW] = "THROW",
|
||||||
[RTN_NAT] = "NAT",
|
[RTN_NAT] = "NAT",
|
||||||
[RTN_XRESOLVE] = "XRESOLVE",
|
[RTN_XRESOLVE] = "XRESOLVE",
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
uart->capabilities = up->capabilities;
|
uart->capabilities = up->capabilities;
|
||||||
--- a/drivers/tty/serial/serial_core.c
|
--- a/drivers/tty/serial/serial_core.c
|
||||||
+++ b/drivers/tty/serial/serial_core.c
|
+++ b/drivers/tty/serial/serial_core.c
|
||||||
@@ -2250,6 +2250,7 @@ uart_report_port(struct uart_driver *drv
|
@@ -2254,6 +2254,7 @@ uart_report_port(struct uart_driver *drv
|
||||||
snprintf(address, sizeof(address),
|
snprintf(address, sizeof(address),
|
||||||
"I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
|
"I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
|
||||||
break;
|
break;
|
||||||
@ -26,7 +26,7 @@
|
|||||||
case UPIO_MEM:
|
case UPIO_MEM:
|
||||||
case UPIO_MEM16:
|
case UPIO_MEM16:
|
||||||
case UPIO_MEM32:
|
case UPIO_MEM32:
|
||||||
@@ -2914,6 +2915,7 @@ int uart_match_port(struct uart_port *po
|
@@ -2918,6 +2919,7 @@ int uart_match_port(struct uart_port *po
|
||||||
case UPIO_HUB6:
|
case UPIO_HUB6:
|
||||||
return (port1->iobase == port2->iobase) &&
|
return (port1->iobase == port2->iobase) &&
|
||||||
(port1->hub6 == port2->hub6);
|
(port1->hub6 == port2->hub6);
|
||||||
|
Loading…
Reference in New Issue
Block a user