Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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+

+3 -3
+3 -3
arch/parisc/boot/compressed/head.S
··· 22 22 __HEAD 23 23 24 24 ENTRY(startup) 25 - .level LEVEL 25 + .level PA_ASM_LEVEL 26 26 27 27 #define PSW_W_SM 0x200 28 28 #define PSW_W_BIT 36 ··· 63 63 load32 BOOTADDR(decompress_kernel),%r3 64 64 65 65 #ifdef CONFIG_64BIT 66 - .level LEVEL 66 + .level PA_ASM_LEVEL 67 67 ssm PSW_W_SM, %r0 /* set W-bit */ 68 68 depdi 0, 31, 32, %r3 69 69 #endif ··· 72 72 73 73 startup_continue: 74 74 #ifdef CONFIG_64BIT 75 - .level LEVEL 75 + .level PA_ASM_LEVEL 76 76 rsm PSW_W_SM, %r0 /* clear W-bit */ 77 77 #endif 78 78