1 files changed, 3 insertions, 5 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4a88cf7695b4..6c70fed0f9a0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -21,7 +21,8 @@ config X86
         select HAVE_IDE
         select HAVE_OPROFILE
         select HAVE_KPROBES
-        select HAVE_KVM
+        select HAVE_KRETPROBES
+        select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
 
 
 config GENERIC_LOCKBREAK
@@ -65,9 +66,6 @@ config MMU
 config ZONE_DMA
         def_bool y
 
-config QUICKLIST
-        def_bool X86_32
-
 config SBUS
         bool
 
@@ -1261,7 +1259,7 @@ menuconfig APM
           machines with more than one CPU.
 
           In order to use APM, you will need supporting software. For location
-          and more information, read <file:Documentation/pm.txt> and the
+          and more information, read <file:Documentation/power/pm.txt> and the
           Battery Powered Linux mini-HOWTO, available from
           <http://www.tldp.org/docs.html#howto>.