aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-06-09 15:59:41 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-06-15 19:20:56 +0200
commitb03826d8aaa659e2581dcff3f96280a8b4683422 (patch)
treed40e8591992ca1b17fd6cd7f4cc2a69eca58fa9d /target/linux/ar71xx
parent21f44e338976f54812a8f917e6648d8167a26936 (diff)
downloadupstream-b03826d8aaa659e2581dcff3f96280a8b4683422.tar.gz
upstream-b03826d8aaa659e2581dcff3f96280a8b4683422.tar.bz2
upstream-b03826d8aaa659e2581dcff3f96280a8b4683422.zip
kernel: bump kernel 4.4 to version 4.4.137
The new option CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE was added, in this commit: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-4.4.y&id=ffe4bf3eb3cfa10f9ef295c08c21f4fe3bb07e21 Handle it by setting it to the opposite value CONFIG_CC_OPTIMIZE_FOR_SIZE is set to. Tested on lantiq Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/config-4.41
-rw-r--r--target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch2
2 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
index a8622454b4..91eb9f0de7 100644
--- a/target/linux/ar71xx/config-4.4
+++ b/target/linux/ar71xx/config-4.4
@@ -230,6 +230,7 @@ CONFIG_ATH79_NVRAM=y
CONFIG_ATH79_PCI_ATH9K_FIXUP=y
# CONFIG_ATH79_ROUTERBOOT is not set
CONFIG_ATH79_WDT=y
+# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CEVT_R4K=y
CONFIG_CLKDEV_LOOKUP=y
diff --git a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
index 374f9be3b4..bbfe7bd803 100644
--- a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
@@ -838,7 +838,7 @@
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -3820,14 +3820,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -3822,14 +3822,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);