diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-03-30 09:42:31 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-04-09 19:31:46 +0200 |
| commit | 5a09eb17c2ca3a8fea09509b09edb30c54e9316e (patch) | |
| tree | 089f490a215b4dba2ef10cb921bac121ce15d83b /target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch | |
| parent | a98ded6c5c1891087fb43499829928b3bc17702f (diff) | |
| download | upstream-5a09eb17c2ca3a8fea09509b09edb30c54e9316e.tar.gz upstream-5a09eb17c2ca3a8fea09509b09edb30c54e9316e.tar.bz2 upstream-5a09eb17c2ca3a8fea09509b09edb30c54e9316e.zip | |
kernel: bump 5.15 to 5.15.32
Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch')
| -rw-r--r-- | target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch index 06bfac2a7e..9cc5719078 100644 --- a/target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1780,6 +1780,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN +@@ -1727,6 +1727,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN The command-line arguments provided by the boot loader will be appended to the the device tree bootargs property. @@ -178,7 +178,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> } --- a/init/main.c +++ b/init/main.c -@@ -110,6 +110,10 @@ +@@ -112,6 +112,10 @@ #include <kunit/test.h> @@ -189,7 +189,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> static int kernel_init(void *); extern void init_IRQ(void); -@@ -906,6 +910,18 @@ asmlinkage __visible void __init __no_sa +@@ -991,6 +995,18 @@ asmlinkage __visible void __init __no_sa pr_notice("Kernel command line: %s\n", saved_command_line); /* parameters may set static keys */ jump_label_init(); |