ckrm_E16

[linux-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index f2bbec7..12c6ab9 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -85,6 +85,8 @@ config SYSVIPC
          you want to run the DOS emulator dosemu under Linux (read the
          DOSEMU-HOWTO, available from <http://www.tldp.org/docs.html#howto>),
          you'll need to say Y here.
+         DOSEMU-HOWTO, available from <http://www.tldp.org/docs.html#howto>),
+         you'll need to say Y here.
 
          You can find documentation about IPC with "info ipc" and also in
          section 6.4 of the Linux Programmer's Guide, available from
@@ -92,7 +94,7 @@ config SYSVIPC
 
 config POSIX_MQUEUE
        bool "POSIX Message Queues"
-       depends on EXPERIMENTAL
+       depends on NET && EXPERIMENTAL
        ---help---
          POSIX variant of message queues is a part of IPC. In POSIX message
          queues every message has a priority which decides about succession
@@ -166,6 +168,19 @@ config CKRM_RES_NUMTASKS
        
          Say N if unsure, Y to use the feature.
 
+config CKRM_RES_BLKIO
+       tristate " Disk I/O Resource Controller"
+       depends on CKRM_TYPE_TASKCLASS && IOSCHED_CFQ
+       default m
+       help
+         Provides a resource controller for best-effort block I/O 
+         bandwidth control. The controller attempts this by proportional 
+         servicing of requests in the I/O scheduler. However, seek
+         optimizations and reordering by device drivers/disk controllers may
+         alter the actual bandwidth delivered to a class.
+       
+         Say N if unsure, Y to use the feature.
+
 config CKRM_TYPE_SOCKETCLASS
        bool "Class Manager for socket groups"
        depends on CKRM
@@ -188,6 +203,30 @@ config CKRM_RES_LISTENAQ
  
          If unsure, say N.
 
+config CKRM_RBCE
+       tristate "Vanilla Rule-based Classification Engine (RBCE)"
+       depends on CKRM && RCFS_FS
+       default m
+       help
+         Provides an optional module to support creation of rules for automatic
+         classification of kernel objects. Rules are created/deleted/modified 
+          through an rcfs interface. RBCE is not required for CKRM. 
+ 
+         If unsure, say N.
+
+config CKRM_CRBCE
+       tristate "Enhanced Rule-based Classification Engine (RBCE)"
+       depends on CKRM && RCFS_FS && RELAYFS_FS && DELAY_ACCT
+       default m
+       help
+         Provides an optional module to support creation of rules for automatic
+         classification of kernel objects, just like RBCE above. In addition,
+         CRBCE provides per-process delay data (requires DELAY_ACCT configured)
+         enabled) and makes information on significant kernel events available
+         to userspace tools through relayfs (requires RELAYFS_FS configured). 
+       
+         If unsure, say N.
+
 endmenu
 
 config SYSCTL
@@ -300,9 +339,9 @@ config DELAY_ACCT
        bool "Enable delay accounting (EXPERIMENTAL)"
        help
          In addition to counting frequency the total delay in ns is also
-         recorded. CPU delays are specified as cpu-wait and cpu-run. Memory
-         delay is recorded for minor and major faults. Information is
-         accessible through /proc/<pid>/delay.
+         recorded. CPU delays are specified as cpu-wait and cpu-run. 
+         I/O delays are recorded for memory and regular I/O.
+         Information is accessible through /proc/<pid>/delay.
 
 
 config KALLSYMS
@@ -313,6 +352,17 @@ config KALLSYMS
           symbolic stack backtraces. This increases the size of the kernel
           somewhat, as all symbols have to be loaded into the kernel image.
 
+config KALLSYMS_ALL
+       bool "Include all symbols in kallsyms"
+       depends on DEBUG_KERNEL && KALLSYMS
+       help
+          Normally kallsyms only contains the symbols of functions, for nicer
+          OOPS messages.  Some debuggers can use kallsyms for other
+          symbols too: say Y here to include all symbols, and you
+          don't care about adding 300k to the size of your kernel.
+
+          Say N.
+
 config FUTEX
        bool "Enable futex support" if EMBEDDED
        default y