diff --git a/[refs] b/[refs]
index 009b1d5309fc..ce2406b1394d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2499d8b6c94df02629631807dd96deae7aa7637
+refs/heads/master: 0a049bb0ab807b4a95dce9cd0b603c01c199a287
diff --git a/trunk/arch/x86/Kconfig.cpu b/trunk/arch/x86/Kconfig.cpu
index c30162202dc4..69e2ee44fdff 100644
--- a/trunk/arch/x86/Kconfig.cpu
+++ b/trunk/arch/x86/Kconfig.cpu
@@ -399,3 +399,7 @@ config X86_MINIMUM_CPU_FAMILY
 	default "4" if X86_32 && (X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK)
 	default "3"
 
+config X86_DEBUGCTLMSR
+	bool
+	depends on !(M586MMX || M586TSC || M586 || M486 || M386)
+	default y