upgrade to ckrm e17

[linux-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 974d758..59b8582 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -90,8 +90,6 @@ 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
@@ -155,19 +153,19 @@ config CKRM
          one of the resource controllers below. Say N if you are unsure. 
 
 config RCFS_FS
-       tristate "Resource Class File System (User API)"
-       depends on CKRM
-       help
+       tristate "Resource Class File System (User API)"
+       depends on CKRM
+       help
          RCFS is the filesystem API for CKRM. This separate configuration 
          option is provided only for debugging and will eventually disappear 
          since rcfs will be automounted whenever CKRM is configured. 
 
-          Say N if unsure, Y if you've enabled CKRM, M to debug rcfs 
+         Say N if unsure, Y if you've enabled CKRM, M to debug rcfs 
          initialization.
 
 config CKRM_TYPE_TASKCLASS
        bool "Class Manager for Task Groups"
-       depends on CKRM
+       depends on CKRM && RCFS_FS
        help
          TASKCLASS provides the extensions for CKRM to track task classes
          This is the base to enable task class based resource control for
@@ -185,6 +183,7 @@ config CKRM_RES_NULL
        
          Say N if unsure, Y to use the feature.
 
+
 config CKRM_RES_NUMTASKS
        tristate "Number of Tasks Resource Manager"
        depends on CKRM_TYPE_TASKCLASS
@@ -271,29 +270,48 @@ config CKRM_RES_LISTENAQ
  
          If unsure, say N.
 
+choice 
+       prompt "Classification Engine"
+       depends on CKRM && RCFS_FS            
+       optional
+       help
+        Select a classification engine (CE) that assists in 
+        automatic classification of kernel objects managed by CKRM when
+        they are created. Without a CE, a user must manually 
+        classify objects into classes. Processes inherit their parent's 
+        classification.
+
+        Only one engine can be built into the kernel though all can be
+        built as modules (only one will load). 
+
+        If unsure, say N.
+
 config CKRM_RBCE
-       tristate "Vanilla Rule-based Classification Engine (RBCE)"
-       depends on CKRM && RCFS_FS
-       default m
+       tristate "Vanilla RBCE"
        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.
+         Vanilla Rule-based Classification Engine (RBCE). Rules for
+         classifying kernel objects are created/deleted/modified through
+         a RCFS directory using a filesystem interface.
+       
+         Any CE is optional. 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
+       tristate "Enhanced RBCE"
+       depends on DELAY_ACCT && RELAYFS_FS 
        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). 
+         Enhanced Rule-based Classification Engine (CRBCE). Like the Vanilla
+         RBCE, rules for classifying kernel objects are created, deleted and
+         modified through a RCFS directory using a filesystem interface 
+         (requires CKRM_RCFS configured).
+ 
+         In addition, CRBCE provides per-process delay data 
+         (requires DELAY_ACCT configured) and makes information on significant
+         kernel events available to userspace tools through relayfs 
+         (requires RELAYFS_FS configured). 
        
-         If unsure, say N.
+         Any CE is optional. If unsure, say N.
+
+endchoice
 
 endmenu
 
@@ -440,7 +458,6 @@ config DELAY_ACCT
          I/O delays are recorded for memory and regular I/O.
          Information is accessible through /proc/<pid>/delay.
 
-
 config KALLSYMS
         bool "Load all symbols for debugging/kksymoops" if EMBEDDED
         default y