1 files changed, 3 insertions, 5 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3be2305709b7..237fc128143d 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
 
@@ -1054,7 +1052,7 @@ config SECCOMP
 
 config CC_STACKPROTECTOR
         bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-        depends on X86_64 && EXPERIMENTAL
+        depends on X86_64 && EXPERIMENTAL && BROKEN
         help
          This option turns on the -fstack-protector GCC feature. This
           feature puts, at the beginning of critical functions, a canary