aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-6.1/920-mangle_bootargs.patch
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2022-10-18 23:24:43 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2023-05-22 22:28:14 +0200
commitfcab78c09fd5c5bcd506afbbf50de37bb839eb2f (patch)
treed1b73d671e0327ab48754cc0e7f2c2d076106b12 /target/linux/generic/pending-6.1/920-mangle_bootargs.patch
parent9aee67efbb4dbb9f813512f60e80a6d7ade66143 (diff)
downloadupstream-fcab78c09fd5c5bcd506afbbf50de37bb839eb2f.tar.gz
upstream-fcab78c09fd5c5bcd506afbbf50de37bb839eb2f.tar.bz2
upstream-fcab78c09fd5c5bcd506afbbf50de37bb839eb2f.zip
generic: 6.1: manually refresh pending patches
Refresh pending patches for kernel 6.1. Changes: - Refresh mtd patches with new implementation. - Change 191-rtc-rs5c372-let_the_alarm_to_be_used_as_wakeup_source as uie_unsupported got dropped and we now set the bit directly. 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.patch4
1 files changed, 2 insertions, 2 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 5f0a106ae4e..23784616624 100644
--- a/target/linux/generic/pending-6.1/920-mangle_bootargs.patch
+++ b/target/linux/generic/pending-6.1/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
-@@ -616,6 +616,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -615,6 +615,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
-@@ -956,6 +979,7 @@ asmlinkage __visible void __init __no_sa
+@@ -955,6 +978,7 @@ asmlinkage __visible void __init __no_sa
pr_notice("%s", linux_banner);
early_security_init();
setup_arch(&command_line);