This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / alpha / Kconfig

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 16328ad..d770bb8 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -626,8 +626,8 @@ config DEBUG_KERNEL
          identify kernel problems.
 
 config MATHEMU
-       tristate "Kernel FP software completion" if DEBUG_KERNEL
-       default y if !DEBUG_KERNEL
+       tristate "Kernel FP software completion" if DEBUG_KERNEL && !SMP
+       default y if !DEBUG_KERNEL || SMP
        help
          This option is required for IEEE compliant floating point arithmetic
          on the Alpha. The only time you would ever not say Y is to say M in
@@ -692,6 +692,8 @@ config DEBUG_INFO
 
 endmenu
 
+source "kernel/vserver/Kconfig"
+
 source "security/Kconfig"
 
 source "crypto/Kconfig"