Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd7df892 authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman
Browse files

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



commit 1829dda0e87f4462782ca81be474c7890efe31ce upstream.

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: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f620942

arch/parisc/include/asm/assembly.h

+3 −3
Original line number Diff line number Diff line
@@ -59,14 +59,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
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <linux/linkage.h>

#include <linux/init.h>



	.level	LEVEL

	.level	PA_ASM_LEVEL



	__INITDATA

ENTRY(boot_args)
@@ -254,7 +254,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
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ registers). 
	 */

#define KILL_INSN	break	0,0



	.level          LEVEL

	.level          PA_ASM_LEVEL



	.text