commit 5641f1fde074651ce2488e93944cf05dedd9bf74
author Al Viro <viro@ftp.linux.org.uk> Mon Jan 05 17:19:02 2009 +0000
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Jan 05 17:41:45 2009 -0800
tree 2ee93ad7f01ead38be0e16dd0ca23bbd20de4131
parent 7483cb7bbc02b9471dda28e54f41287d5374e3ac

X86_DEBUGCTLMSR won't work on uml

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

arch/x86/Kconfig.cpu

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 85a7857..8078955 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -408,7 +408,7 @@
 
 config X86_DEBUGCTLMSR
 	def_bool y
-	depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)
+	depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386) && !UML
 
 menuconfig PROCESSOR_SELECT
 	bool "Supported processor vendors" if EMBEDDED