fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index bdf4519..1fb4623 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -1,3 +1,8 @@
+config DEFCONFIG_LIST
+       string
+       option defconfig_list
+       default "arch/$ARCH/defconfig"
+

 # UML uses the generic IRQ sugsystem
 config GENERIC_HARDIRQS
        bool
 # UML uses the generic IRQ sugsystem
 config GENERIC_HARDIRQS
        bool


@@ -22,10 +27,31 @@ config SBUS
 config PCI
        bool
 
 config PCI
        bool
 

+config PCMCIA
+       bool
+
+# Yet to do!
+config TRACE_IRQFLAGS_SUPPORT
+       bool
+       default n
+
+config LOCKDEP_SUPPORT
+       bool
+       default y
+
+config STACKTRACE_SUPPORT
+       bool
+       default y
+

 config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
 

+config GENERIC_BUG
+       bool
+       default y
+       depends on BUG
+

 # Used in kernel/irq/manage.c and include/linux/irq.h
 config IRQ_RELEASE_METHOD
        bool
 # Used in kernel/irq/manage.c and include/linux/irq.h
 config IRQ_RELEASE_METHOD
        bool


@@ -34,13 +60,16 @@ config IRQ_RELEASE_METHOD
 menu "UML-specific options"
 
 config MODE_TT
 menu "UML-specific options"
 
 config MODE_TT

-       bool "Tracing thread support"
+       bool "Tracing thread support (DEPRECATED)"

        default n
        default n

+       depends on BROKEN

        help
        This option controls whether tracing thread support is compiled
        help
        This option controls whether tracing thread support is compiled

-       into UML.  This option is largely obsolete, given that skas0 provides
+       into UML. This option is largely obsolete, given that skas0 provides

        skas security and performance without needing to patch the host.
        skas security and performance without needing to patch the host.

-       It is safe to say 'N' here.
+       It is safe to say 'N' here; saying 'Y' may cause additional problems
+       with the resulting binary even if you run UML in SKAS mode, and running
+       in TT mode is strongly *NOT RECOMMENDED*.

 
 config STATIC_LINK
        bool "Force a static link"
 
 config STATIC_LINK
        bool "Force a static link"


@@ -53,20 +82,9 @@ config STATIC_LINK
        for use in a chroot jail.  So, if you intend to run UML inside a
        chroot, and you disable CONFIG_MODE_TT, you probably want to say Y
        here.
        for use in a chroot jail.  So, if you intend to run UML inside a
        chroot, and you disable CONFIG_MODE_TT, you probably want to say Y
        here.

-
-config HOST_2G_2G
-       bool "2G/2G host address space split"
-       default n
-       depends on MODE_TT
-       help
-       This is needed when the host on which you run has a 2G/2G memory
-       split, instead of the customary 3G/1G.
-
-       Note that to enable such a host
-       configuration, which makes sense only in some cases, you need special
-       host patches.
-
-       So, if you do not know what to do here, say 'N'.
+       Additionally, this option enables using higher memory spaces (up to
+       2.75G) for UML - disabling CONFIG_MODE_TT and enabling this option leads
+       to best results for this.

 
 config KERNEL_HALF_GIGS
        int "Kernel address space size (in .5G units)"
 
 config KERNEL_HALF_GIGS
        int "Kernel address space size (in .5G units)"


@@ -83,10 +101,13 @@ config MODE_SKAS
        default y
        help
        This option controls whether skas (separate kernel address space)
        default y
        help
        This option controls whether skas (separate kernel address space)

-       support is compiled in.  If you have applied the skas patch to the
-       host, then you certainly want to say Y here (and consider saying N
-       to CONFIG_MODE_TT).  Otherwise, it is safe to say Y.  Disabling this
-       option will shrink the UML binary slightly.
+       support is compiled in.
+       Unless you have specific needs to use TT mode (which applies almost only
+       to developers), you should say Y here.
+       SKAS mode will make use of the SKAS3 patch if it is applied on the host
+       (and your UML will run in SKAS3 mode), but if no SKAS patch is applied
+       on the host it will run in SKAS0 mode, which is anyway faster than TT
+       mode.

 
 source "arch/um/Kconfig.arch"
 source "mm/Kconfig"
 
 source "arch/um/Kconfig.arch"
 source "mm/Kconfig"


@@ -268,7 +289,7 @@ config UML_REAL_TIME_CLOCK
        UML and spend long times with UML stopped at a breakpoint.  In this
        case, when UML is restarted, it will call the timer enough times to make
        up for the time spent at the breakpoint.  This could result in a
        UML and spend long times with UML stopped at a breakpoint.  In this
        case, when UML is restarted, it will call the timer enough times to make
        up for the time spent at the breakpoint.  This could result in a

-       noticable lag.  If this is a problem, then disable this option.
+       noticeable lag.  If this is a problem, then disable this option.

 
 endmenu
 
 
 endmenu