mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.4 to 5.4.187 (#9121)
Signed-off-by: JoseCoW <88561480+JoseCoW@users.noreply.github.com>
This commit is contained in:
parent
a3f70fd357
commit
84b3c270d3
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.4 = .186
|
||||
LINUX_KERNEL_HASH-5.4.186 = 61f7cd24cb8a38d41891d9066c1dfd14a688a9dff7f485922e385654ea8b39b9
|
||||
LINUX_VERSION-5.4 = .187
|
||||
LINUX_KERNEL_HASH-5.4.187 = 189e3db3f2af8578037f9c8b4710e1002bdd56f318c5f8589b40de889be9a7b8
|
||||
|
@ -10,14 +10,11 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
---
|
||||
Makefile | 10 +++----
|
||||
arch/arm/Kconfig | 1 +
|
||||
arch/arm/boot/compressed/Makefile | 1 +
|
||||
arch/arm/kernel/vmlinux.lds.S | 26 ++++++++--------
|
||||
arch/mips/Kconfig | 1 +
|
||||
arch/mips/kernel/vmlinux.lds.S | 4 +--
|
||||
include/asm-generic/vmlinux.lds.h | 63 ++++++++++++++++++++-------------------
|
||||
7 files changed, 55 insertions(+), 51 deletions(-)
|
||||
arch/arm/kernel/vmlinux.lds.S | 10 +++++-----
|
||||
arch/arm/kernel/vmlinux.lds.h | 18 +++++++++---------
|
||||
4 files changed, 16 insertions(+), 14 deletions(-)
|
||||
|
||||
--- a/arch/arm/Kconfig
|
||||
+++ b/arch/arm/Kconfig
|
||||
@ -41,6 +38,15 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
# but it is being used too early to link to meaningful stack_chk logic.
|
||||
--- a/arch/arm/kernel/vmlinux.lds.S
|
||||
+++ b/arch/arm/kernel/vmlinux.lds.S
|
||||
@@ -73,7 +73,7 @@ SECTIONS
|
||||
. = ALIGN(4);
|
||||
__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
|
||||
__start___ex_table = .;
|
||||
- ARM_MMU_KEEP(*(__ex_table))
|
||||
+ KEEP(*(__ex_table))
|
||||
__stop___ex_table = .;
|
||||
}
|
||||
|
||||
@@ -100,24 +100,24 @@ SECTIONS
|
||||
}
|
||||
.init.arch.info : {
|
||||
@ -72,15 +78,6 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
|
||||
--- a/arch/arm/kernel/vmlinux.lds.h
|
||||
+++ b/arch/arm/kernel/vmlinux.lds.h
|
||||
@@ -22,7 +22,7 @@
|
||||
#define ARM_MMU_DISCARD(x)
|
||||
#else
|
||||
#define ARM_MMU_KEEP(x)
|
||||
-#define ARM_MMU_DISCARD(x) x
|
||||
+#define ARM_MMU_DISCARD(x) KEEP(x)
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -41,7 +41,7 @@
|
||||
#define PROC_INFO \
|
||||
. = ALIGN(4); \
|
||||
@ -124,15 +121,15 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
OVERLAY 0xffff0000 : NOCROSSREFS AT(__vectors_lma) { \
|
||||
.vectors { \
|
||||
- *(.vectors) \
|
||||
+ KEEP(*(.vectors)) \
|
||||
+ KEEP(*(.vectors)) \
|
||||
} \
|
||||
.vectors.bhb.loop8 { \
|
||||
- *(.vectors.bhb.loop8) \
|
||||
+ KEEP(*(.vectors.bhb.loop8)) \
|
||||
+ KEEP(*(.vectors.bhb.loop8)) \
|
||||
} \
|
||||
.vectors.bhb.bpiall { \
|
||||
- *(.vectors.bhb.bpiall) \
|
||||
+ KEEP(*(.vectors.bhb.bpiall)) \
|
||||
+ KEEP(*(.vectors.bhb.bpiall)) \
|
||||
} \
|
||||
} \
|
||||
ARM_LMA(__vectors, .vectors); \
|
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||
goto drop;
|
||||
|
||||
@@ -3293,6 +3295,7 @@ static int packet_create(struct net *net
|
||||
@@ -3296,6 +3298,7 @@ static int packet_create(struct net *net
|
||||
mutex_init(&po->pg_vec_lock);
|
||||
po->rollover = NULL;
|
||||
po->prot_hook.func = packet_rcv;
|
||||
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
if (sock->type == SOCK_PACKET)
|
||||
po->prot_hook.func = packet_rcv_spkt;
|
||||
@@ -3930,6 +3933,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
@@ -3939,6 +3942,16 @@ packet_setsockopt(struct socket *sock, i
|
||||
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
|
||||
return 0;
|
||||
}
|
||||
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
default:
|
||||
return -ENOPROTOOPT;
|
||||
}
|
||||
@@ -3986,6 +3999,13 @@ static int packet_getsockopt(struct sock
|
||||
@@ -3995,6 +4008,13 @@ static int packet_getsockopt(struct sock
|
||||
case PACKET_VNET_HDR:
|
||||
val = po->has_vnet_hdr;
|
||||
break;
|
||||
|
@ -658,7 +658,7 @@ Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
|
||||
struct dsa_switch_driver {
|
||||
--- a/net/dsa/dsa2.c
|
||||
+++ b/net/dsa/dsa2.c
|
||||
@@ -325,6 +325,10 @@ static int dsa_port_setup(struct dsa_por
|
||||
@@ -323,6 +323,10 @@ static int dsa_port_setup(struct dsa_por
|
||||
if (err)
|
||||
break;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user