aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/920-mangle_bootargs.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-12-06 15:04:47 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-12-10 09:54:20 +0100
commit5d92949019d898889a2f2c5412662af9083e5bee (patch)
tree9ec05f7fc63c58ee4f3b679ca7713637ec5da573 /target/linux/generic/pending-4.14/920-mangle_bootargs.patch
parent361b5556728a4c069df4c4fb259fa141f71f3958 (diff)
downloadupstream-5d92949019d898889a2f2c5412662af9083e5bee.tar.gz
upstream-5d92949019d898889a2f2c5412662af9083e5bee.tar.bz2
upstream-5d92949019d898889a2f2c5412662af9083e5bee.zip
kernel: bump 4.14 to 4.14.158
Refreshed all patches. Altered patches: - 400-mtd-add-rootfs-split-support.patch Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/920-mangle_bootargs.patch')
-rw-r--r--target/linux/generic/pending-4.14/920-mangle_bootargs.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.14/920-mangle_bootargs.patch b/target/linux/generic/pending-4.14/920-mangle_bootargs.patch
index adeb9f12f9..2f6a52c23d 100644
--- a/target/linux/generic/pending-4.14/920-mangle_bootargs.patch
+++ b/target/linux/generic/pending-4.14/920-mangle_bootargs.patch
@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
help
--- a/init/main.c
+++ b/init/main.c
-@@ -359,6 +359,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -358,6 +358,29 @@ static inline void setup_nr_cpu_ids(void
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
#endif
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
/*
* We need to store the untouched command line for future reference.
* We also need to store the touched command line since the parameter
-@@ -540,6 +563,7 @@ asmlinkage __visible void __init start_k
+@@ -539,6 +562,7 @@ asmlinkage __visible void __init start_k
add_device_randomness(command_line, strlen(command_line));
boot_init_stack_canary();
mm_init_cpumask(&init_mm);