vserver 1.9.5.x5

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

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 98915ad..298c018 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -1,3 +1,8 @@
+# UML uses the generic IRQ sugsystem
+config GENERIC_HARDIRQS
+       bool
+       default y
+

 config USERMODE
        bool
        default y
 config USERMODE
        bool
        default y


@@ -26,6 +31,10 @@ config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 
        bool
        default y
 

+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+

 menu "UML-specific options"
 
 config MODE_TT
 menu "UML-specific options"
 
 config MODE_TT


@@ -59,6 +68,18 @@ config MODE_SKAS
        to CONFIG_MODE_TT).  Otherwise, it is safe to say Y.  Disabling this
        option will shrink the UML binary slightly.
 
        to CONFIG_MODE_TT).  Otherwise, it is safe to say Y.  Disabling this
        option will shrink the UML binary slightly.
 

+source "arch/um/Kconfig_arch"
+
+config LD_SCRIPT_STATIC
+       bool
+       default y
+       depends on MODE_TT || STATIC_LINK
+
+config LD_SCRIPT_DYN
+       bool
+       default y
+       depends on !LD_SCRIPT_STATIC
+

 config NET
        bool "Networking support"
        help
 config NET
        bool "Networking support"
        help


@@ -69,7 +90,7 @@ config NET
        should consider updating your networking tools too because changes
        in the kernel and the tools often go hand in hand. The tools are
        contained in the package net-tools, the location and version number
        should consider updating your networking tools too because changes
        in the kernel and the tools often go hand in hand. The tools are
        contained in the package net-tools, the location and version number

-       of which are given in Documentation/Changes.
+       of which are given in <file:Documentation/Changes>.

 
        For a general introduction to Linux networking, it is highly
        recommended to read the NET-HOWTO, available from
 
        For a general introduction to Linux networking, it is highly
        recommended to read the NET-HOWTO, available from


@@ -100,7 +121,8 @@ config HOSTFS
         say Y or M here; otherwise say N.
 
 config HPPFS
         say Y or M here; otherwise say N.
 
 config HPPFS

-       tristate "HoneyPot ProcFS"
+       tristate "HoneyPot ProcFS (EXPERIMENTAL)"
+       depends on BROKEN

        help
        hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc
        entries to be overridden, removed, or fabricated from the host.
        help
        hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc
        entries to be overridden, removed, or fabricated from the host.


@@ -108,13 +130,17 @@ config HPPFS
        by removing or changing anything in /proc which gives away the
        identity of a UML.
 
        by removing or changing anything in /proc which gives away the
        identity of a UML.
 

-       See http://user-mode-linux.sf.net/hppfs.html for more information.
+       See <http://user-mode-linux.sf.net/hppfs.html> for more information.

 
        You only need this if you are setting up a UML honeypot.  Otherwise,
        it is safe to say 'N' here.
 
 
        You only need this if you are setting up a UML honeypot.  Otherwise,
        it is safe to say 'N' here.
 

+       If you are actively using it, please ask for it to be fixed. In this
+       moment, it does not work on 2.6 (it works somehow on 2.4).
+

 config MCONSOLE
        bool "Management console"
 config MCONSOLE
        bool "Management console"

+       default y

        help
         The user mode linux management console is a low-level interface to
         the kernel, somewhat like the i386 SysRq interface.  Since there is
        help
         The user mode linux management console is a low-level interface to
         the kernel, somewhat like the i386 SysRq interface.  Since there is


@@ -129,21 +155,61 @@ config MCONSOLE
 
         It is safe to say 'Y' here.
 
 
         It is safe to say 'Y' here.
 

+config MAGIC_SYSRQ
+       bool "Magic SysRq key"
+       depends on MCONSOLE
+       ---help---
+       If you say Y here, you will have some control over the system even
+       if the system crashes for example during kernel debugging (e.g., you
+       will be able to flush the buffer cache to disk, reboot the system
+       immediately or dump some status information). A key for each of the
+       possible requests is provided.
+
+       This is the feature normally accomplished by pressing a key
+       while holding SysRq (Alt+PrintScreen).
+
+       On UML, this is accomplished by sending a "sysrq" command with
+       mconsole, followed by the letter for the requested command.
+
+       The keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
+       unless you really know what this hack does.
+

 config HOST_2G_2G
        bool "2G/2G host address space split"
 config HOST_2G_2G
        bool "2G/2G host address space split"

+       default n
+       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'.

 
 config SMP
 
 config SMP

-       bool "Symmetric multi-processing support"
+       bool "Symmetric multi-processing support (EXPERIMENTAL)"

        default n
        default n

+       depends on MODE_TT && EXPERIMENTAL

        help
        help

-        This option enables UML SMP support.  UML implements virtual SMP by
-        allowing as many processes to run simultaneously on the host as
-        there are virtual processors configured.  Obviously, if the host is
-        a uniprocessor, those processes will timeshare, but, inside UML,
-        will appear to be running simultaneously.  If the host is a
-        multiprocessor, then UML processes may run simultaneously, depending
-        on the host scheduler.
-        It is safe to leave this unchanged.
+       This option enables UML SMP support.
+       It is NOT related to having a real SMP box. Not directly, at least.
+
+       UML implements virtual SMP by allowing as many processes to run
+       simultaneously on the host as there are virtual processors configured.
+
+       Obviously, if the host is a uniprocessor, those processes will
+       timeshare, but, inside UML, will appear to be running simultaneously.
+       If the host is a multiprocessor, then UML processes may run
+       simultaneously, depending on the host scheduler.
+
+       This, however, is supported only in TT mode. So, if you use the SKAS
+       patch on your host, switching to TT mode and enabling SMP usually gives
+       you worse performances.
+       Also, since the support for SMP has been under-developed, there could
+       be some bugs being exposed by enabling SMP.
+
+       If you don't know what to do, say N.

 
 config NR_CPUS
        int "Maximum number of CPUs (2-32)"
 
 config NR_CPUS
        int "Maximum number of CPUs (2-32)"


@@ -207,7 +273,7 @@ source "drivers/base/Kconfig"
 
 source "arch/um/Kconfig_char"
 
 
 source "arch/um/Kconfig_char"
 

-source "arch/um/Kconfig_block"
+source "drivers/block/Kconfig"

 
 config NETDEVICES
        bool
 
 config NETDEVICES
        bool


@@ -249,4 +315,9 @@ if BROKEN
        source "drivers/mtd/Kconfig"
 endif
 
        source "drivers/mtd/Kconfig"
 endif
 

+#This is just to shut up some Kconfig warnings, so no prompt.
+config INPUT
+       bool
+       default n
+

 source "arch/um/Kconfig.debug"
 source "arch/um/Kconfig.debug"