diff options
| author | Ansuel Smith <ansuelsmth@gmail.com> | 2021-11-05 00:48:27 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-27 00:07:34 +0000 |
| commit | 483503603cb210919088294051e6d27de1f03718 (patch) | |
| tree | dca6df4d449c46344976d6bea10435678ac61b75 /target/linux/generic/pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch | |
| parent | 1f302afd7350f46ec0fcc4b12b0ad59ac92fe5b6 (diff) | |
| download | upstream-483503603cb210919088294051e6d27de1f03718.tar.gz upstream-483503603cb210919088294051e6d27de1f03718.tar.bz2 upstream-483503603cb210919088294051e6d27de1f03718.zip | |
generic: 5.15: rework pending patch
Rework pending patch for kernel 5.15
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch')
| -rw-r--r-- | target/linux/generic/pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch | 8 |
1 files changed, 5 insertions, 3 deletions
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 2808c95322..91e4b91149 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 @@ -238,12 +238,14 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> +#endif --- a/arch/mips/kernel/relocate_kernel.S +++ b/arch/mips/kernel/relocate_kernel.S -@@ -10,8 +10,9 @@ +@@ -10,10 +10,11 @@ #include <asm/mipsregs.h> #include <asm/stackframe.h> #include <asm/addrspace.h> +#include "machine_kexec.h" + #include <kernel-entry-init.h> + -LEAF(relocate_new_kernel) +LEAF(kexec_relocate_new_kernel) PTR_L a0, arg0 @@ -259,7 +261,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> #ifdef CONFIG_SMP /* @@ -182,9 +183,15 @@ kexec_indirection_page: - PTR 0 + PTR_WD 0 .size kexec_indirection_page, PTRSIZE -relocate_new_kernel_end: @@ -275,7 +277,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> -relocate_new_kernel_size: - EXPORT(relocate_new_kernel_size) -- PTR relocate_new_kernel_end - relocate_new_kernel +- PTR_WD relocate_new_kernel_end - relocate_new_kernel - .size relocate_new_kernel_size, PTRSIZE +kexec_relocate_new_kernel_end: + EXPORT(kexec_relocate_new_kernel_end) |