diff --git a/[refs] b/[refs]
index 81d11854303a..b5ddc74bd123 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9cb02b0be4de3c51edfdd701754e13d9a2d20d6
+refs/heads/master: 2c020a99e058cdfc3a073cbfbfcc6ff55d3bfc43
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 3be2305709b7..4a88cf7695b4 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -1054,7 +1054,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