leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parisc: Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code

Browse Source 
LEVEL is a very common word, and now after many years it suddenly
clashed with another LEVEL define in the DRBD code.
Rename it to PA_ASM_LEVEL instead.

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org>
This commit is contained in:
Helge Deller 2019-05-05 23:54:34 +02:00
parent 11c03dc85f
commit 1829dda0e8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/parisc/include/asm/assembly.h
View File

@ -61,14 +61,14 @@
#define LDCW ldcw,co #define LDCW ldcw,co
#define BL b,l #define BL b,l
# ifdef CONFIG_64BIT # ifdef CONFIG_64BIT
# define LEVEL 2.0w # define PA_ASM_LEVEL 2.0w
# else # else
# define LEVEL 2.0 # define PA_ASM_LEVEL 2.0
# endif # endif
#else #else
#define LDCW ldcw #define LDCW ldcw
#define BL bl #define BL bl
#define LEVEL 1.1 #define PA_ASM_LEVEL 1.1
#endif #endif
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__

4
arch/parisc/kernel/head.S
View File

@ -22,7 +22,7 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h> #include <linux/init.h>
.level LEVEL .level PA_ASM_LEVEL
__INITDATA __INITDATA
ENTRY(boot_args) ENTRY(boot_args)
@ -258,7 +258,7 @@ stext_pdc_ret:
ldo R%PA(fault_vector_11)(%r10),%r10 ldo R%PA(fault_vector_11)(%r10),%r10
$is_pa20: $is_pa20:
.level LEVEL /* restore 1.1 || 2.0w */ .level PA_ASM_LEVEL /* restore 1.1 || 2.0w */
#endif /*!CONFIG_64BIT*/ #endif /*!CONFIG_64BIT*/
load32 PA(fault_vector_20),%r10 load32 PA(fault_vector_20),%r10

2
arch/parisc/kernel/syscall.S
View File

@ -48,7 +48,7 @@ registers).
*/ */
#define KILL_INSN break 0,0 #define KILL_INSN break 0,0
.level LEVEL .level PA_ASM_LEVEL
.text .text