summaryrefslogtreecommitdiffstats
path: root/arch/parisc/boot
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2019-05-05 23:55:02 +0200
committerHelge Deller <deller@gmx.de>2019-05-06 00:10:00 +0200
commitbdca5d64ee92abeacd6dada0bc6f6f8e6350dd67 (patch)
tree9b9fe994ffafd972546518eac1272646cda5658e /arch/parisc/boot
parentparisc: Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code (diff)
downloadlinux-bdca5d64ee92abeacd6dada0bc6f6f8e6350dd67.tar.xz
linux-bdca5d64ee92abeacd6dada0bc6f6f8e6350dd67.zip
parisc: Use PA_ASM_LEVEL in boot code
The LEVEL define clashed with the DRBD code. Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Helge Deller <deller@gmx.de> Cc: <stable@vger.kernel.org> # v4.14+
Diffstat (limited to 'arch/parisc/boot')
-rw-r--r--arch/parisc/boot/compressed/head.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/boot/compressed/head.S b/arch/parisc/boot/compressed/head.S
index 5aba20fa48aa..e8b798fd0cf0 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