diff --git a/[refs] b/[refs]
index 6bde291bfb38..56a57dd0f952 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07ef83ae9e99377f38f4d0e472ba6ff09324e5e9
+refs/heads/master: e0ec9483dbe8f534e0f3ef413f9eba9a5ff78050
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 9727dd59f54c..a783fe7759ca 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -34,7 +34,7 @@ config X86
 	select HAVE_FUNCTION_TRACER
 	select HAVE_FUNCTION_GRAPH_TRACER
 	select HAVE_FUNCTION_TRACE_MCOUNT_TEST
-	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
+	select HAVE_KVM
 	select HAVE_ARCH_KGDB if !X86_VOYAGER
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_GENERIC_DMA_COHERENT if X86_32