From 590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 26 Nov 2022 06:51:56 -0500 Subject: kernel: bump 5.15 to 5.15.80 Manually rebase: pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch ath79/patches-5.15/910-unaligned_access_hacks.patch All other patches automatically rebased Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia --- .../330-MIPS-kexec-Accept-command-line-parameters-from-users.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch') diff --git a/target/linux/generic/pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch b/target/linux/generic/pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch index 3a5f5a238d..3f553b28b3 100644 --- a/target/linux/generic/pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch +++ b/target/linux/generic/pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch @@ -260,7 +260,7 @@ Signed-off-by: Yousong Zhou #ifdef CONFIG_SMP /* -@@ -181,9 +182,15 @@ kexec_indirection_page: +@@ -177,8 +178,15 @@ EXPORT(kexec_indirection_page) PTR_WD 0 .size kexec_indirection_page, PTRSIZE @@ -275,8 +275,7 @@ Signed-off-by: Yousong Zhou + .skip KEXEC_ARGV_SIZE + .size kexec_argv, KEXEC_ARGV_SIZE --relocate_new_kernel_size: -- EXPORT(relocate_new_kernel_size) +-EXPORT(relocate_new_kernel_size) - PTR_WD relocate_new_kernel_end - relocate_new_kernel - .size relocate_new_kernel_size, PTRSIZE +kexec_relocate_new_kernel_end: -- cgit v1.2.3