lkml.org 
[lkml]   [2015]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 RESEND 1/11] x86/vdso32: Define PGTABLE_LEVELS to 32bit VDSO
    Date
    In case of CONFIG_X86_64, vdso32/vclock_gettime.c fakes a 32-bit
    non-PAE kernel configuration by re-defining it to CONFIG_X86_32.
    However, it does not re-define CONFIG_PGTABLE_LEVELS leaving it
    as 4 levels.

    This mismatch leads <asm/pgtable_type.h> to NOT include <asm-generic/
    pgtable-nopud.h> and <asm-generic/pgtable-nopmd.h>, which will cause
    compile errors when a later patch enhances <asm/pgtable_type.h> to
    use PUD_SHIFT and PMD_SHIFT. These -nopud & -nopmd headers define
    these SHIFTs for the 32-bit non-PAE kernel.

    Fix it by re-defining CONFIG_PGTABLE_LEVELS to 2 levels.

    Signed-off-by: Toshi Kani <toshi.kani@hpe.com>
    Cc: Juergen Gross <jgross@suse.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Borislav Petkov <bp@alien8.de>
    ---
    arch/x86/entry/vdso/vdso32/vclock_gettime.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/arch/x86/entry/vdso/vdso32/vclock_gettime.c b/arch/x86/entry/vdso/vdso32/vclock_gettime.c
    index 175cc72..87a86e0 100644
    --- a/arch/x86/entry/vdso/vdso32/vclock_gettime.c
    +++ b/arch/x86/entry/vdso/vdso32/vclock_gettime.c
    @@ -14,11 +14,13 @@
    */
    #undef CONFIG_64BIT
    #undef CONFIG_X86_64
    +#undef CONFIG_PGTABLE_LEVELS
    #undef CONFIG_ILLEGAL_POINTER_VALUE
    #undef CONFIG_SPARSEMEM_VMEMMAP
    #undef CONFIG_NR_CPUS

    #define CONFIG_X86_32 1
    +#define CONFIG_PGTABLE_LEVELS 2
    #define CONFIG_PAGE_OFFSET 0
    #define CONFIG_ILLEGAL_POINTER_VALUE 0
    #define CONFIG_NR_CPUS 1

    \
     
     \ /
      Last update: 2015-09-17 21:01    [W:4.281 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site