]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
X86_DEBUGCTLMSR won't work on uml
authorAl Viro <viro@ftp.linux.org.uk>
Mon, 5 Jan 2009 17:19:02 +0000 (17:19 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Jan 2009 01:41:45 +0000 (17:41 -0800)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/Kconfig.cpu

index 85a78575956cb0bdf473c4694f29eb7d497a154e..8078955845ae8778482f0f0662c1e2a50bae5713 100644 (file)
@@ -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