queue-4.4/parisc-rename-level-to-pa_asm_level-to-avoid-name-clash-with-drbd-code.patch

   1 From 1829dda0e87f4462782ca81be474c7890efe31ce Mon Sep 17 00:00:00 2001
   2 From: Helge Deller <deller@gmx.de>
   3 Date: Sun, 5 May 2019 23:54:34 +0200
   4 Subject: parisc: Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code
   5
   6 From: Helge Deller <deller@gmx.de>
   7
   8 commit 1829dda0e87f4462782ca81be474c7890efe31ce upstream.
   9
  10 LEVEL is a very common word, and now after many years it suddenly
  11 clashed with another LEVEL define in the DRBD code.
  12 Rename it to PA_ASM_LEVEL instead.
  13
  14 Reported-by: kbuild test robot <lkp@intel.com>
  15 Signed-off-by: Helge Deller <deller@gmx.de>
  16 Cc: <stable@vger.kernel.org>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18
  19 ---
  20  arch/parisc/include/asm/assembly.h |    6 +++---
  21  arch/parisc/kernel/head.S          |    4 ++--
  22  arch/parisc/kernel/syscall.S       |    2 +-
  23  3 files changed, 6 insertions(+), 6 deletions(-)
  24
  25 --- a/arch/parisc/include/asm/assembly.h
  26 +++ b/arch/parisc/include/asm/assembly.h
  27 @@ -59,14 +59,14 @@
  28  #define LDCW           ldcw,co
  29  #define BL             b,l
  30  # ifdef CONFIG_64BIT
  31 -#  define LEVEL                2.0w
  32 +#  define PA_ASM_LEVEL 2.0w
  33  # else
  34 -#  define LEVEL                2.0
  35 +#  define PA_ASM_LEVEL 2.0
  36  # endif
  37  #else
  38  #define LDCW           ldcw
  39  #define BL             bl
  40 -#define LEVEL          1.1
  41 +#define PA_ASM_LEVEL   1.1
  42  #endif
  43
  44  #ifdef __ASSEMBLY__
  45 --- a/arch/parisc/kernel/head.S
  46 +++ b/arch/parisc/kernel/head.S
  47 @@ -22,7 +22,7 @@
  48  #include <linux/linkage.h>
  49  #include <linux/init.h>
  50
  51 -       .level  LEVEL
  52 +       .level  PA_ASM_LEVEL
  53
  54         __INITDATA
  55  ENTRY(boot_args)
  56 @@ -245,7 +245,7 @@ stext_pdc_ret:
  57         ldo             R%PA(fault_vector_11)(%r10),%r10
  58
  59  $is_pa20:
  60 -       .level          LEVEL /* restore 1.1 || 2.0w */
  61 +       .level          PA_ASM_LEVEL /* restore 1.1 || 2.0w */
  62  #endif /*!CONFIG_64BIT*/
  63         load32          PA(fault_vector_20),%r10
  64
  65 --- a/arch/parisc/kernel/syscall.S
  66 +++ b/arch/parisc/kernel/syscall.S
  67 @@ -48,7 +48,7 @@ registers).
  68          */
  69  #define KILL_INSN      break   0,0
  70
  71 -       .level          LEVEL
  72 +       .level          PA_ASM_LEVEL
  73
  74         .text
  75