aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-6.1/920-mangle_bootargs.patch
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2023-05-22 18:07:49 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2023-05-22 22:28:17 +0200
commit4ed347aaad5de7b50d047f29aa99138b9b265daa (patch)
tree5752ff821b8834c0ebd8fc7d77714f1879c98bc4 /target/linux/generic/pending-6.1/920-mangle_bootargs.patch
parentaa56d00aa624ffdc3ed839300d1284f890d31bf7 (diff)
downloadupstream-4ed347aaad5de7b50d047f29aa99138b9b265daa.tar.gz
upstream-4ed347aaad5de7b50d047f29aa99138b9b265daa.tar.bz2
upstream-4ed347aaad5de7b50d047f29aa99138b9b265daa.zip
generic: 6.1: refresh pending patches
Refresh pending patches with make target/linux/refresh. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-6.1/920-mangle_bootargs.patch')
-rw-r--r--target/linux/generic/pending-6.1/920-mangle_bootargs.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-6.1/920-mangle_bootargs.patch b/target/linux/generic/pending-6.1/920-mangle_bootargs.patch
index 23784616624..60ceff00d66 100644
--- a/target/linux/generic/pending-6.1/920-mangle_bootargs.patch
+++ b/target/linux/generic/pending-6.1/920-mangle_bootargs.patch
@@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1814,6 +1814,15 @@ config EMBEDDED
+@@ -1826,6 +1826,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
-@@ -615,6 +615,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -609,6 +609,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
-@@ -955,6 +978,7 @@ asmlinkage __visible void __init __no_sa
+@@ -957,6 +980,7 @@ asmlinkage __visible void __init __no_sa
pr_notice("%s", linux_banner);
early_security_init();
setup_arch(&command_line);