Skip to content

Commit

Permalink
parisc: Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Helge Deller committed May 5, 2019
1 parent 11c03dc commit 1829dda
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions arch/parisc/include/asm/assembly.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__
Expand Down
4 changes: 2 additions & 2 deletions arch/parisc/kernel/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <linux/linkage.h>
#include <linux/init.h>

.level LEVEL
.level PA_ASM_LEVEL

__INITDATA
ENTRY(boot_args)
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion arch/parisc/kernel/syscall.S
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ registers).
*/
#define KILL_INSN break 0,0

.level LEVEL
.level PA_ASM_LEVEL

.text

Expand Down

0 comments on commit 1829dda

Please sign in to comment.