Added some help text that was in 2.5, but not 2.4.

1 files changed, 100 insertions, 7 deletions

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index ba7697f..96669d2 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -15204,12 +15204,6 @@ CONFIG_USB_DSBR
   The module will be called dsbr100.o. If you want to compile it as a
   module, say M here and read <file:Documentation/modules.txt>.
 
-CONFIG_BLK_DEV_UBD
-  The User-Mode Linux port includes a driver called UBD which will let
-  you access arbitrary files on the host computer as block devices.
-  Unless you know that you do not need such virtual block devices say
-  Y here.
-
 Alcatel Speedtouch USB support
 CONFIG_USB_SPEEDTOUCH
   Say Y here if you have an Alcatel SpeedTouch USB or SpeedTouch 330
@@ -15221,6 +15215,63 @@ CONFIG_USB_SPEEDTOUCH
   The module will be called speedtch.o. If you want to compile it as
   a module, say M here and read <file:Documentation/modules.txt>.
 
+Support for /proc/mm
+CONFIG_PROC_MM
+  Enables support for address space separation through /proc/mm.
+  A host kernel needs to have this enabled in order for UML to
+  run in skas mode.  UML kernels do not need to have this option
+  unless they will host sub-UMLs.
+
+  If you don't know what this does just say Y.
+
+Separate Kernel Address Space support
+CONFIG_MODE_SKAS
+  This option controls whether skas (separate kernel address space)
+  support is compiled in.  If you have applied the skas patch to the
+  host and enabled support for /proc/mm in the host kernel, 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.
+
+Tracing thread support
+CONFIG_MODE_TT
+  This option controls whether tracing thread support is compiled
+  into UML.  Normally, this should be set to Y.  If you intend to
+  use only skas mode (and the host has the skas patch applied to it),
+  then it is OK to say N here.
+
+Force a static link
+CONFIG_STATIC_LINK
+  If CONFIG_MODE_TT is disabled, then this option gives you the ability
+  to force a static link of UML.  Normally, if only skas mode is built
+  in to UML, it will be linked as a shared binary.  This is inconvenient
+  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.
+
+2G/2G host address space split
+CONFIG_HOST_2G_2G
+  Most Linux machines are configured so that the kernel occupies the
+  upper 1G of the 4G address space and processes use the lower 3G.
+  However, some machine are configured with a 2G/2G split, with the
+  kernel occupying the upper 2G and processes using the lower 2G.
+
+  To allow UML to run on a such host you have to say Y here. N should be
+  a safe choice most of the time.
+
+Kernel stack size order
+CONFIG_KERNEL_STACK_ORDER
+  This option determines the size of UML kernel stacks.  They will
+  be 1 << order pages.  The default is OK unless you're running Valgrind
+  on UML, in which case, set this to 3.
+
+UML ubd block driver
+CONFIG_BLK_DEV_UBD
+  The User-Mode Linux port includes a driver called UBD which will let
+  you access arbitrary files on the host computer as block devices.
+  Unless you know that you do not need such virtual block devices say
+  Y here.
+
 Always do synchronous disk IO for UBD
 CONFIG_BLK_DEV_UBD_SYNC
   Writes to the virtual block device are not immediately written to the host's
@@ -15276,7 +15327,7 @@ CONFIG_GCOV
   This option allows developers to retrieve coverage data from a UML
   session.
 
-  See <http://user-mode-linux.sourceforge.net/gcov.html> for more
+  See <http://user-mode-linux.sourceforge.net/gprof.html> for more
   details.
 
   If you're involved in UML kernel development and want to use gcov,
@@ -15313,6 +15364,19 @@ CONFIG_HOSTFS
   If you'd like to be able to work with files stored on the host, 
   say Y or M here; otherwise say N.
 
+HoneyPot ProcFS
+CONFIG_HPPFS
+  hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc
+  entries to be overridden, removed, or fabricated from the host.
+  Its purpose is to allow a UML to appear to be a physical machine
+  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.
+
+  You only need this if you are setting up a UML honeypot.  Otherwise,
+  it is safe to say 'N' here.
+
 Example IO Memory driver
 CONFIG_MMAPPER
   The User-Mode Linux port can provide support for IO Memory
@@ -15328,6 +15392,21 @@ CONFIG_MMAPPER
   If you'd like to be able to provide a simulated IO port space for
   User-Mode Linux processes, say Y.  If unsure, say N.
 
+Anonymous Memory support
+CONFIG_DEV_ANON
+  Don't ask. Just say Y.
+
+Support for software watchdog inside UML
+CONFIG_UML_WATCHDOG
+  Support for a virtual hardware watchdog. It's safe to say N here.
+
+COW block device
+CONFIG_COW
+  This is a layered driver which sits above two other block devices.
+  One is read-only, and the other is a read-write layer which stores
+  all changes.  This provides the illusion that the read-only layer
+  can be mounted read-write and changed.
+
 Virtual Serial Line
 CONFIG_SSL
   The User-Mode Linux environment allows you to create virtual serial
@@ -15483,6 +15562,20 @@ CONFIG_UML_NET_SLIRP
 
   Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp"
 
+pcap transport
+CONFIG_UML_NET_PCAP
+ The pcap transport makes a pcap packet stream on the host look
+  like an ethernet device inside UML.  This is useful for making
+  UML act as a network monitor for the host.  You must have libcap
+  installed in order to build the pcap transport into UML.
+
+  For more information, see
+  <http://user-mode-linux.sourceforge.net/networking.html>  That site
+  has examples of the UML command line to use to enable this option.
+
+  If you intend to use UML as a network monitor for the host, say
+  Y here.  Otherwise, say N.
+
 Default main console channel initialization
 CONFIG_CON_ZERO_CHAN
   This is the string describing the channel to which the main console