[patch 26/38] CKRM e18: Classification Engines - RBCE and CRBCE are mutually exclusive

[Gerrit Huizenga]

Ensure that RBCE and CRBCE are only configured when the other is not
built into the kernel.

Update CRBCE help text to reflect switch from using RelayFS to netlink.

Signed-Off-By: Matt Helsley <matthltc@xxxxxxxxxx>
Signed-Off-By: Gerrit Huizenga <gh@xxxxxxxxxx>

--

Index: linux-2.6.12-ckrm1/init/Kconfig
===================================================================
--- linux-2.6.12-ckrm1.orig/init/Kconfig	2005-06-20 15:02:49.000000000 -0700
+++ linux-2.6.12-ckrm1/init/Kconfig	2005-06-20 15:04:52.000000000 -0700
@@ -206,7 +206,7 @@ config CKRM_RES_NUMTASKS
 
 config CKRM_RBCE
 	tristate "Vanilla Rule-based Classification Engine (RBCE)"
-	depends on CKRM && RCFS_FS
+	depends on CKRM && RCFS_FS && CKRM_CRBCE != y
 	default m
 	help
 	  Provides an optional module to support creation of rules for automatic
@@ -217,14 +217,14 @@ config CKRM_RBCE
 
 config CKRM_CRBCE
 	tristate "Enhanced Rule-based Classification Engine (RBCE)"
-	depends on CKRM && RCFS_FS && DELAY_ACCT
+	depends on CKRM && RCFS_FS && DELAY_ACCT && CKRM_RBCE != y && NET
 	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).
+	  to userspace tools through netlink.
 
 	  If unsure, say N.
 endmenu

--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/