]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
parisc: Use PA_ASM_LEVEL in boot code
authorHelge Deller <deller@gmx.de>
Sun, 5 May 2019 21:55:02 +0000 (23:55 +0200)
committerHelge Deller <deller@gmx.de>
Sun, 5 May 2019 22:10:00 +0000 (00:10 +0200)
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+
arch/parisc/boot/compressed/head.S

index 5aba20fa48aafeac0ce7475bdf228b803d7f2f5c..e8b798fd0cf038d5b596d5d988a3c9e83e073a09 100644 (file)
@@ -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