Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c32dfec8 authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman
Browse files

parisc: Prevent booting 64-bit kernels on PA1.x machines 



commit a406b8b424fa01f244c1aab02ba186258448c36b upstream.

Bail out early with error message when trying to boot a 64-bit kernel on
32-bit machines. This fixes the previous commit to include the check for
true 64-bit kernels as well.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Fixes: 591d2108f3abc ("parisc: Add runtime check to prevent PA2.0 kernels on PA1.x machines")
Cc:  <stable@vger.kernel.org> # v6.0+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d570d139

arch/parisc/kernel/head.S

+2 −3
Original line number Diff line number Diff line
@@ -69,9 +69,8 @@ $bss_loop: 
	stw,ma          %arg2,4(%r1)

	stw,ma          %arg3,4(%r1)



#if !defined(CONFIG_64BIT) && defined(CONFIG_PA20)

	/* This 32-bit kernel was compiled for PA2.0 CPUs. Check current CPU

	 * and halt kernel if we detect a PA1.x CPU. */

#if defined(CONFIG_PA20)

	/* check for 64-bit capable CPU as required by current kernel */

	ldi		32,%r10

	mtctl		%r10,%cr11

	.level 2.0