diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index d7e79e752a..0a20aa0a12 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -363,14 +363,13 @@ config KEXEC
 
 config EFI_SET_VIRTUAL_ADDRESS_MAP
     bool "EFI: call SetVirtualAddressMap()" if EXPERT
+    default y
     help
       Call EFI SetVirtualAddressMap() runtime service to setup memory map for
       further runtime services. According to UEFI spec, it isn't strictly
       necessary, but many UEFI implementations misbehave when this call is
       missing.
 
-      If unsure, say N.
-
 config XSM
 	bool "Xen Security Modules support"
 	default ARM