upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 48618a9..f87000a 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -3,7 +3,7 @@ config GENERIC_HARDIRQS
        bool
        default y
 
-config USERMODE
+config UML
        bool
        default y
 
@@ -31,6 +31,10 @@ config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
 menu "UML-specific options"
 
 config MODE_TT
@@ -64,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.
 
+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
@@ -74,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
-       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
@@ -114,7 +130,7 @@ config HPPFS
        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.
@@ -139,6 +155,25 @@ config MCONSOLE
 
         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"
        default n
@@ -209,7 +244,7 @@ config KERNEL_HALF_GIGS
 
 config HIGHMEM
        bool "Highmem support"
-       depends on BROKEN
+       depends on !64BIT
 
 config KERNEL_STACK_ORDER
        int "Kernel stack size order"
@@ -238,7 +273,7 @@ source "drivers/base/Kconfig"
 
 source "arch/um/Kconfig_char"
 
-source "arch/um/Kconfig_block"
+source "drivers/block/Kconfig"
 
 config NETDEVICES
        bool
@@ -280,6 +315,7 @@ if BROKEN
        source "drivers/mtd/Kconfig"
 endif
 
+#This is just to shut up some Kconfig warnings, so no prompt.
 config INPUT
        bool
        default n