Use PA_ASM_LEVEL in boot code

PATCH New Helge Deller 1 participant 1 message May 5, 2019 PA-RISC architecture

lore

Share & tools

lore

Helge Deller

author maintainer

2019-05-05 21:55 UTC #0 lore raw

PATCH 1/1 Use PA_ASM_LEVEL in boot code

The LEVEL define clashed with the DRBD code.

Signed-off-by Helge Deller <[email protected]>

Cc <[email protected]> # v4.14+

arch/parisc/boot/compressed/head.S +3 -3

index 5aba20fa48aa..e8b798fd0cf0 100644
@@ -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