Bump kernel to 4.4.138

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index b6b7894773ff56ad379d0044c24e32395a8ca35a..1b5f987b2c56b930b0238014c3d954a842dce23e 100644 (file)
--- 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 4711fd7f5bff377a515b34629a5706839666884f..14284ff3c3413c35b6344cb74ecdb5e6c13cd66c 100644 (file)
--- 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 4733d1b79c35c3fa2632e2a6fca494a7ca63e55c..b304e141b903856400cb8a75e46f5a63133908fa 100644 (file)
--- 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