projects/linux·commit bdca5d64

parisc: Use PA_ASM_LEVEL in boot code

bdca5d64 · Helge Deller <[email protected]> · 2019-05-05 23:55:02 +02:00

The LEVEL define clashed with the DRBD code.

Reported-by: kbuild test robot <[email protected]>
Signed-off-by: Helge Deller <[email protected]>
Cc: <[email protected]> # v4.14+
Commit
bdca5d64ee92abeacd6dada0bc6f6f8e6350dd67
Parents
1829dda0

Changes

1 files changed · +3 −3

FileStatusAddDelContent
arch/parisc/boot/compressed/head.Smodified+3−3View file

arch/parisc/boot/compressed/head.S

View file
diff --git a/arch/parisc/boot/compressed/head.S b/arch/parisc/boot/compressed/head.S
index 5aba20f..e8b798f 100644
--- a/arch/parisc/boot/compressed/head.S
+++ b/arch/parisc/boot/compressed/head.S
@@ -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