tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
parisc: 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.
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org>
+6
-6
+3
-3
arch/parisc/include/asm/assembly.h
+3
-3
arch/parisc/include/asm/assembly.h
···
61
61
#define LDCW ldcw,co
62
62
#define BL b,l
63
63
# ifdef CONFIG_64BIT
64
-
# define LEVEL 2.0w
64
+
# define PA_ASM_LEVEL 2.0w
65
65
# else
66
-
# define LEVEL 2.0
66
+
# define PA_ASM_LEVEL 2.0
67
67
# endif
68
68
#else
69
69
#define LDCW ldcw
70
70
#define BL bl
71
-
#define LEVEL 1.1
71
+
#define PA_ASM_LEVEL 1.1
72
72
#endif
73
73
74
74
#ifdef __ASSEMBLY__
+2
-2
arch/parisc/kernel/head.S
+2
-2
arch/parisc/kernel/head.S
···
22
22
#include <linux/linkage.h>
23
23
#include <linux/init.h>
24
24
25
-
.level LEVEL
25
+
.level PA_ASM_LEVEL
26
26
27
27
__INITDATA
28
28
ENTRY(boot_args)
···
258
258
ldo R%PA(fault_vector_11)(%r10),%r10
259
259
260
260
$is_pa20:
261
-
.level LEVEL /* restore 1.1 || 2.0w */
261
+
.level PA_ASM_LEVEL /* restore 1.1 || 2.0w */
262
262
#endif /*!CONFIG_64BIT*/
263
263
load32 PA(fault_vector_20),%r10
264
264