From: Greg Kroah-Hartman Date: Mon, 27 Nov 2023 12:47:14 +0000 (+0000) Subject: fix up queue-4.14/parisc-prevent-booting-64-bit-kernels-on-pa1.x-machines.patch X-Git-Tag: v4.14.331~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=487570fa6a9533e4f2ba1b4502a12e236832f6eb;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-4.14/parisc-prevent-booting-64-bit-kernels-on-pa1.x-machines.patch --- diff --git a/queue-4.14/parisc-prevent-booting-64-bit-kernels-on-pa1.x-machines.patch b/queue-4.14/parisc-prevent-booting-64-bit-kernels-on-pa1.x-machines.patch index d7901c24cbb..6bb257ecc10 100644 --- a/queue-4.14/parisc-prevent-booting-64-bit-kernels-on-pa1.x-machines.patch +++ b/queue-4.14/parisc-prevent-booting-64-bit-kernels-on-pa1.x-machines.patch @@ -16,8 +16,8 @@ Fixes: 591d2108f3abc ("parisc: Add runtime check to prevent PA2.0 kernels on PA1 Cc: # v6.0+ Signed-off-by: Greg Kroah-Hartman --- - arch/parisc/kernel/head.S | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + arch/parisc/kernel/head.S | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S @@ -33,3 +33,12 @@ Signed-off-by: Greg Kroah-Hartman ldi 32,%r10 mtctl %r10,%cr11 .level 2.0 +@@ -84,7 +83,7 @@ $bss_loop: + $iodc_panic: + copy %arg0, %r10 + copy %arg1, %r11 +- load32 PA(init_stack),%sp ++ load32 PA(__bss_stop),%sp + #define MEM_CONS 0x3A0 + ldw MEM_CONS+32(%r0),%arg0 // HPA + ldi ENTRY_IO_COUT,%arg1