[PATCH] csa: Extended system accounting over taskstats

[linux-2.6-omap-h63xx.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 4381006dd666aaba6f9d1e29913d65fe5c3e5a8c..f7a04d0daf077450e95926d68a4cb0ae52547c7e 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -92,7 +92,7 @@ config LOCALVERSION_AUTO
 
 config SWAP
        bool "Support for paging of anonymous memory (swap)"
-       depends on MMU
+       depends on MMU && BLOCK
        default y
        help
          This option allows you to choose whether you want to have support
@@ -202,7 +202,7 @@ config AUDITSYSCALL
          ensure that INOTIFY is configured.
 
 config IKCONFIG
-       bool "Kernel .config support"
+       tristate "Kernel .config support"
        ---help---
          This option enables the complete Linux kernel ".config" file
          contents to be saved in the kernel. It provides documentation
@@ -257,6 +257,18 @@ config CC_OPTIMIZE_FOR_SIZE
 
          If unsure, say N.
 
+config TASK_XACCT
+       bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
+       depends on TASKSTATS
+       help
+         Collect extended task accounting data and send the data
+         to userland for processing over the taskstats interface.
+
+         Say N if unsure.
+
+config SYSCTL
+       bool
+
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help
@@ -272,11 +284,8 @@ config UID16
        help
          This enables the legacy 16-bit UID syscall wrappers.
 
-config SYSCTL
-       bool
-
 config SYSCTL_SYSCALL
-       bool "Sysctl syscall support"
+       bool "Sysctl syscall support" if EMBEDDED
        default n
        select SYSCTL
        ---help---
@@ -285,11 +294,11 @@ config SYSCTL_SYSCALL
          and use.  The interface in /proc/sys is now the primary and what
          everyone uses.
 
-         Nothing has been using the binary sysctl interface for some time
+         Nothing has been using the binary sysctl interface for some
          time now so nothing should break if you disable sysctl syscall
-         support, and you kernel will get marginally smaller.
+         support, and your kernel will get marginally smaller.
 
-         Unless you have an application that uses the sys_syscall interface
+         Unless you have an application that uses the sys_sysctl interface
          you should probably say N here.
 
 config KALLSYMS