diff options
| author | Helge Deller <deller@gmx.de> | 2019-05-05 23:54:34 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2019-05-06 00:09:56 +0200 |
| commit | 1829dda0e87f4462782ca81be474c7890efe31ce (patch) | |
| tree | e97a28eee010a400ed24993b1d76d7e123471197 /arch/parisc/include | |
| parent | 11c03dc85f02901ce9b6a1ced099fdcaeb188572 (diff) | |
| download | linux-1829dda0e87f4462782ca81be474c7890efe31ce.tar.bz2 | |
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>
Diffstat (limited to 'arch/parisc/include')
| -rw-r--r-- | arch/parisc/include/asm/assembly.h | 6 |
1 files changed, 3 insertions, 3 deletions
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__ |