From 47f68ca58615fa71d7905130fb28d3ffe51effa2 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Thu, 18 Oct 2018 12:11:27 +0200 Subject: kernel: bump 4.14 to 4.14.77 Refreshed all patches. Altered patches: - 666-Add-support-for-MAP-E-FMRs-mesh-mode.patch New symbol for arm targets: - HARDEN_BRANCH_PREDICTOR Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte Tested-by: Stijn Tintel --- target/linux/mediatek/mt7623/config-4.14 | 1 + .../mediatek/patches-4.14/0048-net-core-add-RPS-balancer.patch | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'target/linux/mediatek') diff --git a/target/linux/mediatek/mt7623/config-4.14 b/target/linux/mediatek/mt7623/config-4.14 index 05d99941cd..a38f02f2d1 100644 --- a/target/linux/mediatek/mt7623/config-4.14 +++ b/target/linux/mediatek/mt7623/config-4.14 @@ -193,6 +193,7 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y # CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y +CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y diff --git a/target/linux/mediatek/patches-4.14/0048-net-core-add-RPS-balancer.patch b/target/linux/mediatek/patches-4.14/0048-net-core-add-RPS-balancer.patch index 6cb5fa7495..01589f224d 100644 --- a/target/linux/mediatek/patches-4.14/0048-net-core-add-RPS-balancer.patch +++ b/target/linux/mediatek/patches-4.14/0048-net-core-add-RPS-balancer.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3636,6 +3636,58 @@ set_rps_cpu(struct net_device *dev, stru +@@ -3658,6 +3658,58 @@ set_rps_cpu(struct net_device *dev, stru return rflow; } @@ -69,7 +69,7 @@ Signed-off-by: John Crispin /* * get_rps_cpu is called from netif_receive_skb and returns the target * CPU from the RPS map of the receiving queue for a given skb. -@@ -3725,7 +3777,7 @@ static int get_rps_cpu(struct net_device +@@ -3747,7 +3799,7 @@ static int get_rps_cpu(struct net_device try_rps: if (map) { @@ -78,7 +78,7 @@ Signed-off-by: John Crispin if (cpu_online(tcpu)) { cpu = tcpu; goto done; -@@ -8810,6 +8862,9 @@ static int __init net_dev_init(void) +@@ -8834,6 +8886,9 @@ static int __init net_dev_init(void) sd->backlog.weight = weight_p; } -- cgit v1.2.3