aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-12-03 08:57:01 -0500
committerNick Hainke <vincent@systemli.org>2023-12-04 12:47:55 +0100
commitc6a41bffc9a7eabb7763f97aa51144d3e218aec0 (patch)
tree381486b572cc6c5d6c787f82f963e262e5e4653c /target/linux/generic/pending-5.15/920-mangle_bootargs.patch
parent57d7382cb159dbb15b8e281cad90a65d4c0201f6 (diff)
downloadupstream-c6a41bffc9a7eabb7763f97aa51144d3e218aec0.tar.gz
upstream-c6a41bffc9a7eabb7763f97aa51144d3e218aec0.tar.bz2
upstream-c6a41bffc9a7eabb7763f97aa51144d3e218aec0.zip
kernel: bump 5.15 to 5.15.141
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.141 All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
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 7e1f26d243f..5f2bb8c37f4 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
-@@ -614,6 +614,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -618,6 +618,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
-@@ -953,6 +976,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);