lkml.org 
[lkml]   [2016]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2] MIPS: fix duplicate define
    Date
    The mips build of ip27_defconfig is failing with the error:
    In file included from ../arch/mips/include/asm/mach-ip27/spaces.h:29:0,
    from ../arch/mips/include/asm/page.h:12,
    from ../arch/mips/vdso/vdso.h:26,
    from ../arch/mips/vdso/gettimeofday.c:11:
    ../arch/mips/include/asm/mach-generic/spaces.h:28:0:
    error: "CAC_BASE" redefined [-Werror]
    #define CAC_BASE _AC(0x80000000, UL)

    In file included from ../arch/mips/include/asm/page.h:12:0,
    from ../arch/mips/vdso/vdso.h:26,
    from ../arch/mips/vdso/gettimeofday.c:11:
    ../arch/mips/include/asm/mach-ip27/spaces.h:22:0:
    note: this is the location of the previous definition
    #define CAC_BASE 0xa800000000000000

    Add a condition to check if CAC_BASE is already defined, and define it
    only if it is not yet defined.

    Fixes: 3ffc17d8768b ("MIPS: Adjust MIPS64 CAC_BASE to reflect Config.K0")
    Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
    ---

    v2: corrected a silly mistake of overlooking #else

    Build log is at:
    https://travis-ci.org/sudipm-mukherjee/parport/jobs/174134289

    arch/mips/include/asm/mach-generic/spaces.h | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h
    index 952b0fd..3d6d3b0 100644
    --- a/arch/mips/include/asm/mach-generic/spaces.h
    +++ b/arch/mips/include/asm/mach-generic/spaces.h
    @@ -22,11 +22,13 @@
    #endif

    #ifdef CONFIG_32BIT
    +#ifndef CAC_BASE
    #ifdef CONFIG_KVM_GUEST
    #define CAC_BASE _AC(0x40000000, UL)
    #else
    #define CAC_BASE _AC(0x80000000, UL)
    #endif
    +#endif
    #ifndef IO_BASE
    #define IO_BASE _AC(0xa0000000, UL)
    #endif
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-11-09 21:45    [W:3.407 / U:1.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site