From: "Parag Warudkar" I think the easy and correct fix for this situation is defining CONFIG_ARCH_HAS_SETUP_ADDITIONAL_PAGES on x86_64 only if IA32_EMULATION is defined. (Because x86_64 proper doesn't seem to require arch_setup_additional_pages() only IA32 emulation requires it.) Signed-off-by: Parag Warudkar Cc: Andi Kleen Signed-off-by: Andrew Morton --- arch/x86_64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/x86_64/Kconfig~x86-fix-vdso-mapping-for-aout-executables-x86_64-fixpatch arch/x86_64/Kconfig --- a/arch/x86_64/Kconfig~x86-fix-vdso-mapping-for-aout-executables-x86_64-fixpatch +++ a/arch/x86_64/Kconfig @@ -401,7 +401,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID config ARCH_HAS_SETUP_ADDITIONAL_PAGES bool default y - depends on X86_64 + depends on X86_64 && IA32_EMULATION config OUT_OF_LINE_PFN_TO_PAGE def_bool y _