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 d7901c24cbb29ab18c62ed0a7bc67f2c24ea0195..6bb257ecc101814b95e8074915777fc88726f60f 100644 (file)
--- 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:  <stable@vger.kernel.org> # v6.0+
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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 <gregkh@linuxfoundation.org>
        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