From 8a600d4d82c7905d0a56749edbd4106f86999c4b Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Thu, 28 Jun 2018 16:04:31 -0400 Subject: [PATCH] Bump kernel to 4.4.138 --- include/kernel-version.mk | 4 ++-- target/linux/generic/config-4.4 | 3 ++- target/linux/generic/patches-4.4/901-debloat_sock_diag.patch | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b6b7894773..1b5f987b2c 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,9 +2,9 @@ LINUX_RELEASE?=1 -LINUX_VERSION-4.4 = .132 +LINUX_VERSION-4.4 = .138 -LINUX_KERNEL_HASH-4.4.132 = 29d274e289ff15b3658124dba624e631a1d0319a2baab255044fa3b8f7aa5604 +LINUX_KERNEL_HASH-4.4.138 = 546f14592bf9ef7a680b280fa1ff56c05467dd34195a4d51af9808fb8aca6080 ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4 index 4711fd7f5b..14284ff3c3 100644 --- a/target/linux/generic/config-4.4 +++ b/target/linux/generic/config-4.4 @@ -590,6 +590,7 @@ CONFIG_CARDBUS=y # CONFIG_CAVIUM_OCTEON_SOC is not set # CONFIG_CB710_CORE is not set # CONFIG_CC10001_ADC is not set +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CC_STACKPROTECTOR is not set CONFIG_CC_STACKPROTECTOR_NONE=y @@ -916,7 +917,6 @@ CONFIG_DEVPORT=y # CONFIG_DGAP is not set # CONFIG_DGNC is not set # CONFIG_DHT11 is not set -# CONFIG_DIRECT_IO is not set # CONFIG_DISCONTIGMEM_MANUAL is not set # CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set # CONFIG_DISPLAY_CONNECTOR_DVI is not set @@ -3314,6 +3314,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_SCHEDSTATS is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SCHED_DEBUG is not set +CONFIG_SCHED_HRTICK=y # CONFIG_SCHED_MC is not set CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_SCHED_SMT is not set diff --git a/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch b/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch index 4733d1b79c..b304e141b9 100644 --- a/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch +++ b/target/linux/generic/patches-4.4/901-debloat_sock_diag.patch @@ -30,7 +30,7 @@ static void __sk_free(struct sock *sk) { +#ifdef CONFIG_SOCK_DIAG - if (unlikely(sock_diag_has_destroy_listeners(sk) && sk->sk_net_refcnt)) + if (unlikely(sk->sk_net_refcnt && sock_diag_has_destroy_listeners(sk))) sock_diag_broadcast_destroy(sk); else +#endif -- 2.25.1