Skip to contentSkip to conversation

Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code

PATCH In review Helge Deller 2 participants 3 messages May 5, 2019 PA-RISC architecture

lore
Share & tools
lore

Helge Deller

author maintainer
#0 lore raw

PATCH 1/1 Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code

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.

Signed-off-by Helge Deller <[email protected]>
Cc <[email protected]>
arch/parisc/include/asm/assembly.h +3 -3
index c17ec0ee6e7c..d85738a7bbe6 100644
@@ -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 +2 -2
index fefaba2097b5..d12de2a13753 100644
@@ -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 +1 -1
index e2b4c8d81275..e54d5e4d3489 100644
@@ -48,7 +48,7 @@ registers).
 	 */
 #define KILL_INSN	break	0,0
 
-	.level          LEVEL
+	.level          PA_ASM_LEVEL
 
 	.text
#1 lore raw
Quoted 3 lines · Helge Deller

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.

I'm sure we used it first ;-)

Dave

Signature · 1 line
John David Anglin  [email protected]
author maintainer
#2 lore raw
Quoted 6 lines · John David Anglin
Quoted 3 lines · Helge Deller

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.

I'm sure we used it first ;-)

Yes, we did.
LEVEL is #defined in both:
- drivers/block/drbd/drbd_vli.h (since year 2009)
- arch/parisc/include/asm/assembly.h (*earlier* than year 2005).

Helge