aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
diff options
context:
space:
mode:
authorAnsuel Smith <ansuelsmth@gmail.com>2022-03-21 15:22:20 +0100
committerDaniel Golle <daniel@makrotopia.org>2022-03-27 05:00:50 +0100
commit009f8afe06258adff30d83e936d097e42d5501ca (patch)
tree8d8059364dd135646aae277ace45e77674c19865 /target/linux/generic/pending-5.15/920-mangle_bootargs.patch
parent49cb5e501a8d6eb8ff5cad63f13282de7b84e7ef (diff)
downloadupstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.gz
upstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.bz2
upstream-009f8afe06258adff30d83e936d097e42d5501ca.zip
generic: 5.15: refresh pending patch
Use 'make target/linux/refresh' to refresh pending patches. Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.15/920-mangle_bootargs.patch')
-rw-r--r--target/linux/generic/pending-5.15/920-mangle_bootargs.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-5.15/920-mangle_bootargs.patch b/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
index bd9de92000..d3f3a1c639 100644
--- a/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
+++ b/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
@@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1800,6 +1800,15 @@ config EMBEDDED
+@@ -1805,6 +1805,15 @@ config EMBEDDED
an embedded system so certain expert options are available
for configuration.
@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
help
--- a/init/main.c
+++ b/init/main.c
-@@ -608,6 +608,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -614,6 +614,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
-@@ -869,6 +892,7 @@ asmlinkage __visible void __init __no_sa
+@@ -954,6 +977,7 @@ asmlinkage __visible void __init __no_sa
pr_notice("%s", linux_banner);
early_security_init();
setup_arch(&command_line);