“f186373fef005cee948a4a39e6a14c2e5f517298”上不存在“fs/btrfs/math.h”
提交 dbec33d8 编写于 作者: H Helge Deller 提交者: Xie XiuQi

parisc: Use PA_ASM_LEVEL in boot code

commit bdca5d64ee92abeacd6dada0bc6f6f8e6350dd67 upstream.

The LEVEL define clashed with the DRBD code.
Reported-by: Nkbuild test robot <lkp@intel.com>
Signed-off-by: NHelge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org> # v4.14+
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 9d4b63f1
...@@ -22,7 +22,7 @@ ...@@ -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: ...@@ -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: ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册