projects/linux·commit 1829dda0

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

1829dda0 · Helge Deller <[email protected]> · 2019-05-05 23:54:34 +02:00

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 <[email protected]>
Signed-off-by: Helge Deller <[email protected]>
Cc: <[email protected]>
Commit
1829dda0e87f4462782ca81be474c7890efe31ce
Parents
11c03dc8

Changes

3 files changed · +6 −6

FileStatusAddDelContent
arch/parisc/include/asm/assembly.hmodified+3−3View file
arch/parisc/kernel/head.Smodified+2−2View file
arch/parisc/kernel/syscall.Smodified+1−1View file

arch/parisc/include/asm/assembly.h

View file
diff --git a/arch/parisc/include/asm/assembly.h b/arch/parisc/include/asm/assembly.h
index c17ec0e..d85738a 100644
--- a/arch/parisc/include/asm/assembly.h
+++ b/arch/parisc/include/asm/assembly.h
@@ -61,14 +61,14 @@
#define LDCW ldcw,co
#define BL b,l
# ifdef CONFIG_64BIT
-# define LEVEL 2.0w
+# define PA_ASM_LEVEL 2.0w
# else
-# define LEVEL 2.0
+# define PA_ASM_LEVEL 2.0
# endif
#else
#define LDCW ldcw
#define BL bl
-#define LEVEL 1.1
+#define PA_ASM_LEVEL 1.1
#endif
#ifdef __ASSEMBLY__

arch/parisc/kernel/head.S

View file
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S
index fefaba2..d12de2a 100644
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -22,7 +22,7 @@
#include <linux/linkage.h>
#include <linux/init.h>
- .level LEVEL
+ .level PA_ASM_LEVEL
__INITDATA
ENTRY(boot_args)
@@ -258,7 +258,7 @@ stext_pdc_ret:
ldo R%PA(fault_vector_11)(%r10),%r10
$is_pa20:
- .level LEVEL /* restore 1.1 || 2.0w */
+ .level PA_ASM_LEVEL /* restore 1.1 || 2.0w */
#endif /*!CONFIG_64BIT*/
load32 PA(fault_vector_20),%r10

arch/parisc/kernel/syscall.S

View file
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index e2b4c8d..e54d5e4 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -48,7 +48,7 @@ registers).
*/
#define KILL_INSN break 0,0
- .level LEVEL
+ .level PA_ASM_LEVEL
.text