1 files changed, 1 insertions, 2 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5bcdede71ba4..f760a22f95dc 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -209,7 +209,7 @@ config X86_TRAMPOLINE
 
 config X86_32_LAZY_GS
         def_bool y
-        depends on X86_32
+        depends on X86_32 && !CC_STACKPROTECTOR
 
 config KTIME_SCALAR
         def_bool X86_32
@@ -1356,7 +1356,6 @@ config CC_STACKPROTECTOR_ALL
 
 config CC_STACKPROTECTOR
         bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-        depends on X86_64
         select CC_STACKPROTECTOR_ALL
         help
           This option turns on the -fstack-protector GCC feature. This