From f529696ddd484c57e21c8317e50c2b7389411311 Mon Sep 17 00:00:00 2001 From: RISCi_ATOM Date: Mon, 8 Jan 2018 12:32:58 -0500 Subject: [PATCH] Bump 4.4 kernel to 4.4.110 ( based upon upstream OpenWRT commit : 7f5a040359cf227bc54d2ef553d469f85ed413e2 --- include/kernel-version.mk | 5 +++-- .../linux/generic/patches-4.4/653-disable_netlink_trim.patch | 2 +- target/linux/generic/patches-4.4/902-debloat_proc.patch | 2 +- .../linux/generic/patches-4.4/921-use_preinit_as_init.patch | 2 +- target/linux/generic/patches-4.4/995-mangle_bootargs.patch | 4 ++-- target/linux/x86/64/config-default | 1 + 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 40f69a27b3..92cef05d31 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,9 +2,10 @@ LINUX_RELEASE?=1 -LINUX_VERSION-4.4 = .108 +LINUX_VERSION-4.4 = .110 + +LINUX_KERNEL_HASH-4.4.110 = b3d8c524f7b1b9f8022e1d3ab9349af21d3fd93f5fe73c6b395dbd8994efd692 -LINUX_KERNEL_HASH-4.4.108 = aaf270b84e7b55e7cad0777a6d17515b9afa681d320178364d66926acebd8cb3 ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) endif diff --git a/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch b/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch index 5f46885708..b11104be9e 100644 --- a/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch +++ b/target/linux/generic/patches-4.4/653-disable_netlink_trim.patch @@ -1,6 +1,6 @@ --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c -@@ -1228,24 +1228,7 @@ void netlink_detachskb(struct sock *sk, +@@ -1231,24 +1231,7 @@ void netlink_detachskb(struct sock *sk, static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) { diff --git a/target/linux/generic/patches-4.4/902-debloat_proc.patch b/target/linux/generic/patches-4.4/902-debloat_proc.patch index 5aada68e31..248ba8f670 100644 --- a/target/linux/generic/patches-4.4/902-debloat_proc.patch +++ b/target/linux/generic/patches-4.4/902-debloat_proc.patch @@ -133,7 +133,7 @@ } --- a/mm/vmstat.c +++ b/mm/vmstat.c -@@ -1555,10 +1555,12 @@ static int __init setup_vmstat(void) +@@ -1556,10 +1556,12 @@ static int __init setup_vmstat(void) cpu_notifier_register_done(); #endif #ifdef CONFIG_PROC_FS diff --git a/target/linux/generic/patches-4.4/921-use_preinit_as_init.patch b/target/linux/generic/patches-4.4/921-use_preinit_as_init.patch index 1f4e6322b1..3aba9d63ba 100644 --- a/target/linux/generic/patches-4.4/921-use_preinit_as_init.patch +++ b/target/linux/generic/patches-4.4/921-use_preinit_as_init.patch @@ -1,6 +1,6 @@ --- a/init/main.c +++ b/init/main.c -@@ -964,7 +964,8 @@ static int __ref kernel_init(void *unuse +@@ -966,7 +966,8 @@ static int __ref kernel_init(void *unuse panic("Requested init %s failed (error %d).", execute_command, ret); } diff --git a/target/linux/generic/patches-4.4/995-mangle_bootargs.patch b/target/linux/generic/patches-4.4/995-mangle_bootargs.patch index 2483e1bb98..e008dd9098 100644 --- a/target/linux/generic/patches-4.4/995-mangle_bootargs.patch +++ b/target/linux/generic/patches-4.4/995-mangle_bootargs.patch @@ -1,6 +1,6 @@ --- a/init/main.c +++ b/init/main.c -@@ -355,6 +355,29 @@ static inline void setup_nr_cpu_ids(void +@@ -356,6 +356,29 @@ static inline void setup_nr_cpu_ids(void static inline void smp_prepare_cpus(unsigned int maxcpus) { } #endif @@ -30,7 +30,7 @@ /* * We need to store the untouched command line for future reference. * We also need to store the touched command line since the parameter -@@ -527,6 +550,7 @@ asmlinkage __visible void __init start_k +@@ -529,6 +552,7 @@ asmlinkage __visible void __init start_k pr_notice("%s", linux_banner); setup_arch(&command_line); mm_init_cpumask(&init_mm); diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default index b7028e49d5..7d38df3030 100644 --- a/target/linux/x86/64/config-default +++ b/target/linux/x86/64/config-default @@ -226,6 +226,7 @@ CONFIG_NR_CPUS=8 # CONFIG_NUMA is not set CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_PADATA=y +CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y # CONFIG_PARAVIRT_DEBUG is not set -- 2.25.1