Merge branch 'x86/core' into core/percpu

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/mm/init_32.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc mm/vmalloc.c
Simple merge