lkml.org 
[lkml]   [2019]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.0 028/139] parisc: Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code
    Date
    From: Helge Deller <deller@gmx.de>

    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: kbuild test robot <lkp@intel.com>
    Signed-off-by: Helge Deller <deller@gmx.de>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/parisc/include/asm/assembly.h | 6 +++---
    arch/parisc/kernel/head.S | 4 ++--
    arch/parisc/kernel/syscall.S | 2 +-
    3 files changed, 6 insertions(+), 6 deletions(-)

    --- 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__
    --- a/arch/parisc/kernel/head.S
    +++ b/arch/parisc/kernel/head.S
    @@ -22,7 +22,7 @@
    #include <linux/linkage.h>
    #include <linux/init.h>

    - .level LEVEL
    + .level PA_ASM_LEVEL

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

    --- a/arch/parisc/kernel/syscall.S
    +++ b/arch/parisc/kernel/syscall.S
    @@ -48,7 +48,7 @@ registers).
    */
    #define KILL_INSN break 0,0

    - .level LEVEL
    + .level PA_ASM_LEVEL

    .text


    \
     
     \ /
      Last update: 2019-05-23 22:09    [W:7.030 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site