aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/920-mangle_bootargs.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-10-01 09:22:00 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-10-02 22:02:26 +0200
commitd6a9a92e32177e8236812045d09deacc4e36be26 (patch)
treeb42a2c4eea5d7d8e126a4cfeb45e572578ea6522 /target/linux/generic/pending-5.4/920-mangle_bootargs.patch
parent2d72671b6e7469dbc5b2e79cb1be77c4e13a9c92 (diff)
downloadupstream-d6a9a92e32177e8236812045d09deacc4e36be26.tar.gz
upstream-d6a9a92e32177e8236812045d09deacc4e36be26.tar.bz2
upstream-d6a9a92e32177e8236812045d09deacc4e36be26.zip
kernel: bump 5.4 to 5.4.69
Seemingly unneeded based on new upstream code so manually deleted: layerscape: 820-usb-0007-usb-dwc3-gadget-increase-timeout-value-for-send-ep-c.patch Manually merged: generic-hack: 251-sound_kconfig.patch All other modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711 Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [add lantiq test report, minor commit message clarification] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/generic/pending-5.4/920-mangle_bootargs.patch')
-rw-r--r--target/linux/generic/pending-5.4/920-mangle_bootargs.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch b/target/linux/generic/pending-5.4/920-mangle_bootargs.patch
index f1c80460e9..7523b396ba 100644
--- a/target/linux/generic/pending-5.4/920-mangle_bootargs.patch
+++ b/target/linux/generic/pending-5.4/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
-@@ -366,6 +366,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -367,6 +367,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
-@@ -596,6 +619,7 @@ asmlinkage __visible void __init start_k
+@@ -597,6 +620,7 @@ asmlinkage __visible void __init start_k
pr_notice("%s", linux_banner);
early_security_init();
setup_arch(&command_line);