diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 68e9e518d6c7..75e797b1e497 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -40,6 +40,7 @@ CONFIG_EMBEDDED=y
 # CONFIG_SLAB_MERGE_DEFAULT is not set
 CONFIG_PROFILING=y
 CONFIG_SMP=y
+CONFIG_X86_X2APIC=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 CONFIG_NR_CPUS=32