[PATCH] UML: fix the INIT_ENV_ARG_LIMIT dependencies

[linux-2.6] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index f70f2fd273c2152708bdac6800d038229b58a8cc..a5b073a103e7cf9cd5a3438765a97e6468c23c6f 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -54,8 +54,8 @@ config LOCK_KERNEL
 
 config INIT_ENV_ARG_LIMIT
        int
 
 config INIT_ENV_ARG_LIMIT
        int

-       default 32 if !USERMODE
-       default 128 if USERMODE
+       default 32 if !UML
+       default 128 if UML

        help
          Maximum of each of the number of arguments and environment
          variables passed to init from the kernel command line.
        help
          Maximum of each of the number of arguments and environment
          variables passed to init from the kernel command line.


@@ -379,6 +379,15 @@ config SLAB
          SLOB is more space efficient but does not scale well and is
          more susceptible to fragmentation.
 
          SLOB is more space efficient but does not scale well and is
          more susceptible to fragmentation.
 

+config VM_EVENT_COUNTERS
+       default y
+       bool "Enable VM event counters for /proc/vmstat" if EMBEDDED
+       help
+         VM event counters are only needed to for event counts to be
+         shown. They have no function for the kernel itself. This
+         option allows the disabling of the VM event counters.
+         /proc/vmstat will only show page counts.
+

 endmenu                # General setup
 
 config TINY_SHMEM
 endmenu                # General setup
 
 config TINY_SHMEM