From: Al Viro <viro@ftp.linux.org.uk>
Date: Mon, 5 Jan 2009 17:19:02 +0000 (+0000)
Subject: X86_DEBUGCTLMSR won't work on uml
X-Git-Tag: v2.6.29-rc1~510
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5641f1fde074651ce2488e93944cf05dedd9bf74;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 85a78575956..8078955845a 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -408,7 +408,7 @@ config X86_MINIMUM_CPU_FAMILY
 
 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