kernel: bump 4.4 to 4.4.110

Refresh patches

Fixes:  CVE-2017-5754 aka Meltdown

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
[fix typo in commit msg, conflict after 4.14 bump]
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
Kevin Darbyshire-Bryant
2018-01-07 14:12:52 +00:00
committed by Stijn Tintel
parent 1d2590f838
commit efb375b579
26 changed files with 136 additions and 125 deletions

View File

@@ -5,7 +5,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
--- a/Makefile
+++ b/Makefile
@@ -1118,7 +1118,6 @@ all: modules
@@ -1121,7 +1121,6 @@ all: modules
PHONY += modules
modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
@@ -1148,7 +1147,6 @@ _modinst_:
@@ -1151,7 +1150,6 @@ _modinst_:
rm -f $(MODLIB)/build ; \
ln -s $(CURDIR) $(MODLIB)/build ; \
fi

View File

@@ -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)
{

View File

@@ -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

View File

@@ -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);
}

View File

@@ -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);