aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-08-08 19:57:20 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-08-10 21:07:50 +0200
commitec0ff928d929f076cdfb4ab1be96d2cf24c1d29b (patch)
treedd863a603628055afd3656cd63f4958d2aa4542f /target/linux/generic/pending-5.15/920-mangle_bootargs.patch
parent795a5dd4529d7030fd141b9644a1752b863c2fd4 (diff)
downloadupstream-ec0ff928d929f076cdfb4ab1be96d2cf24c1d29b.tar.gz
upstream-ec0ff928d929f076cdfb4ab1be96d2cf24c1d29b.tar.bz2
upstream-ec0ff928d929f076cdfb4ab1be96d2cf24c1d29b.zip
kernel: bump 5.15 to 5.15.125
1. Add new symbols to generic config 2. Bump kernel Changelog: https://lore.kernel.org/stable/2023080818-groin-gradient-a031@gregkh/ All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> [Refreshed on top of OpenWrt 23.05] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit daed3322d347cae5fa538907b5f1fa5d5cfc08c6)
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.patch4
1 files changed, 2 insertions, 2 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 5f0a106ae4..7e1f26d243 100644
--- a/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
+++ b/target/linux/generic/pending-5.15/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
+@@ -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
-@@ -956,6 +979,7 @@ asmlinkage __visible void __init __no_sa
+@@ -953,6 +976,7 @@ asmlinkage __visible void __init __no_sa
pr_notice("%s", linux_banner);
early_security_init();
setup_arch(&command_line);