diff --git a/[refs] b/[refs]
index eca0aed43678..63c3e94a6947 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 958a2f29a6520a1d2973077ce7854ea9a44f48a2
+refs/heads/master: 6d98ca736441029e4e87ad3b6dc4a8645dc4c6d3
diff --git a/trunk/arch/x86/Kconfig.debug b/trunk/arch/x86/Kconfig.debug
index 5fc8d0b3191d..ac1e31ba4795 100644
--- a/trunk/arch/x86/Kconfig.debug
+++ b/trunk/arch/x86/Kconfig.debug
@@ -257,6 +257,7 @@ config CPA_DEBUG
 
 config OPTIMIZE_INLINING
 	bool "Allow gcc to uninline functions marked 'inline'"
+	depends on BROKEN
 	help
 	  This option determines if the kernel forces gcc to inline the functions
 	  developers have marked 'inline'. Doing so takes away freedom from gcc to