ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

parisc: Use PA_ASM_LEVEL in boot code

Browse Source 
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+
This commit is contained in:
Helge Deller
2019-05-05 23:55:02 +02:00
parent 1829dda0e8
commit bdca5d64ee
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/parisc/boot/compressed/head.S
View File

@@ -22,7 +22,7 @@
__HEAD __HEAD
ENTRY(startup) ENTRY(startup)
.level LEVEL .level PA_ASM_LEVEL
#define PSW_W_SM 0x200 #define PSW_W_SM 0x200
#define PSW_W_BIT 36 #define PSW_W_BIT 36
@@ -63,7 +63,7 @@ $bss_loop:
load32 BOOTADDR(decompress_kernel),%r3 load32 BOOTADDR(decompress_kernel),%r3
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
.level LEVEL .level PA_ASM_LEVEL
ssm PSW_W_SM, %r0 /* set W-bit */ ssm PSW_W_SM, %r0 /* set W-bit */
depdi 0, 31, 32, %r3 depdi 0, 31, 32, %r3
#endif #endif
@@ -72,7 +72,7 @@ $bss_loop:
startup_continue: startup_continue:
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
.level LEVEL .level PA_ASM_LEVEL
rsm PSW_W_SM, %r0 /* clear W-bit */ rsm PSW_W_SM, %r0 /* clear W-bit */
#endif #endif