fb535ccb30
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: Andrew Morton <akpm@linux-foundation.org> Cc: Juergen Gross <jgross@suse.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Konrad Wilk <konrad.wilk@oracle.com> Cc: Robert Elliot <elliott@hpe.com> Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/1442514264-12475-2-git-send-email-toshi.kani@hpe.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
33 lines
618 B
C
33 lines
618 B
C
#define BUILD_VDSO32
|
|
|
|
#ifndef CONFIG_CC_OPTIMIZE_FOR_SIZE
|
|
#undef CONFIG_OPTIMIZE_INLINING
|
|
#endif
|
|
|
|
#undef CONFIG_X86_PPRO_FENCE
|
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
/*
|
|
* in case of a 32 bit VDSO for a 64 bit kernel fake a 32 bit kernel
|
|
* configuration
|
|
*/
|
|
#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
|
|
|
|
#define BUILD_VDSO32_64
|
|
|
|
#endif
|
|
|
|
#include "../vclock_gettime.c"
|