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

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

parisc: Use PA_ASM_LEVEL in boot code 



commit bdca5d64ee92abeacd6dada0bc6f6f8e6350dd67 upstream.

The LEVEL define clashed with the DRBD code.

Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org> # v4.14+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 615260c9

arch/parisc/boot/compressed/head.S

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
	__HEAD



ENTRY(startup)

	 .level LEVEL

	 .level PA_ASM_LEVEL



#define PSW_W_SM	0x200

#define PSW_W_BIT       36
@@ -63,7 +63,7 @@ $bss_loop: 
	load32	BOOTADDR(decompress_kernel),%r3



#ifdef CONFIG_64BIT

	.level LEVEL

	.level PA_ASM_LEVEL

	ssm	PSW_W_SM, %r0		/* set W-bit */

	depdi	0, 31, 32, %r3

#endif
@@ -72,7 +72,7 @@ $bss_loop: 


startup_continue:

#ifdef CONFIG_64BIT

	.level LEVEL

	.level PA_ASM_LEVEL

	rsm	PSW_W_SM, %r0		/* clear W-bit */

#endif