diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-01-07 14:12:52 +0000 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-01-10 00:11:39 +0200 |
| commit | efb375b5795dd26fed078fff8463ae5b49a73551 (patch) | |
| tree | 0aac089e40804674f475674256debf320fe50589 /target/linux/generic/pending-4.4/995-mangle_bootargs.patch | |
| parent | 1d2590f83826bb9cdf658001761593519186ce0e (diff) | |
| download | upstream-efb375b5795dd26fed078fff8463ae5b49a73551.tar.gz upstream-efb375b5795dd26fed078fff8463ae5b49a73551.tar.bz2 upstream-efb375b5795dd26fed078fff8463ae5b49a73551.zip | |
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>
Diffstat (limited to 'target/linux/generic/pending-4.4/995-mangle_bootargs.patch')
| -rw-r--r-- | target/linux/generic/pending-4.4/995-mangle_bootargs.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.4/995-mangle_bootargs.patch b/target/linux/generic/pending-4.4/995-mangle_bootargs.patch index 2483e1bb98..e008dd9098 100644 --- a/target/linux/generic/pending-4.4/995-mangle_bootargs.patch +++ b/target/linux/generic/pending-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); |