lkml.org 
[lkml]   [2019]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] x86: fix double definition for __VIRTUAL_MASK_SHIFT
    Date
    __VIRTUAL_MASK_SHIFT is defined twice to the same valie in
    arch/x86/include/asm/page_32_types.h. Fix it.

    Signed-off-by: Yury Norov <ynorov@marvell.com>
    ---
    arch/x86/include/asm/page_32_types.h | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
    index 0d5c739eebd7..9bfac5c80d89 100644
    --- a/arch/x86/include/asm/page_32_types.h
    +++ b/arch/x86/include/asm/page_32_types.h
    @@ -28,6 +28,8 @@
    #define MCE_STACK 0
    #define N_EXCEPTION_STACKS 1

    +#define __VIRTUAL_MASK_SHIFT 32
    +
    #ifdef CONFIG_X86_PAE
    /*
    * This is beyond the 44 bit limit imposed by the 32bit long pfns,
    @@ -36,11 +38,8 @@
    * The real limit is still 44 bits.
    */
    #define __PHYSICAL_MASK_SHIFT 52
    -#define __VIRTUAL_MASK_SHIFT 32
    -
    #else /* !CONFIG_X86_PAE */
    #define __PHYSICAL_MASK_SHIFT 32
    -#define __VIRTUAL_MASK_SHIFT 32
    #endif /* CONFIG_X86_PAE */

    /*
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-05-08 22:44    [W:4.985 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site