* [PATCH] Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code
@ 2019-05-05 21:54 Helge Deller
2019-05-05 22:03 ` John David Anglin
0 siblings, 1 reply; 3+ messages in thread
From: Helge Deller @ 2019-05-05 21:54 UTC (permalink / raw)
To: linux-parisc, James Bottomley, John David Anglin
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 <deller@gmx.de>
Cc: <stable@vger.kernel.org>
diff --git a/arch/parisc/include/asm/assembly.h b/arch/parisc/include/asm/assembly.h
index c17ec0ee6e7c..d85738a7bbe6 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__
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S
index fefaba2097b5..d12de2a13753 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
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index e2b4c8d81275..e54d5e4d3489 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code
2019-05-05 21:54 [PATCH] Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code Helge Deller
@ 2019-05-05 22:03 ` John David Anglin
2019-05-05 22:07 ` Helge Deller
0 siblings, 1 reply; 3+ messages in thread
From: John David Anglin @ 2019-05-05 22:03 UTC (permalink / raw)
To: Helge Deller, linux-parisc, James Bottomley
On 2019-05-05 5:54 p.m., Helge Deller wrote:
> 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
--
John David Anglin dave.anglin@bell.net
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code
2019-05-05 22:03 ` John David Anglin
@ 2019-05-05 22:07 ` Helge Deller
0 siblings, 0 replies; 3+ messages in thread
From: Helge Deller @ 2019-05-05 22:07 UTC (permalink / raw)
To: John David Anglin, linux-parisc, James Bottomley
On 06.05.19 00:03, John David Anglin wrote:
> On 2019-05-05 5:54 p.m., Helge Deller wrote:
>> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-05 22:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-05 21:54 [PATCH] Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code Helge Deller
2019-05-05 22:03 ` John David Anglin
2019-05-05 22:07 ` Helge Deller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).