X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=init%2FKconfig;h=77387418e2380e3c5e77dd2f16b2a81777452750;hb=90ad8654ffeb336af8c878fdf7bc72e2ac72467a;hp=64ca2fcb72ad6830d93abd57186381f151f5f0d1;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/init/Kconfig b/init/Kconfig
index 64ca2fcb7..77387418e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -41,6 +41,15 @@ config CLEAN_COMPILE
 
 	  If unsure, say Y
 
+config STANDALONE
+	bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL
+	default y
+	help
+	  Select this option if you don't have magic firmware for drivers that
+	  need it.
+
+	  If unsure, say Y.
+
 config BROKEN
 	bool
 	depends on !CLEAN_COMPILE
@@ -115,18 +124,6 @@ config BSD_PROCESS_ACCT
 	  up to the user level program to do useful things with this
 	  information.  This is generally a good idea, so say Y.
 
-config BSD_PROCESS_ACCT_V3
-	bool "BSD Process Accounting version 3 file format"
-	depends on BSD_PROCESS_ACCT
-	default n
-	help
-	  If you say Y here, the process accounting information is written
-	  in a new file format that also logs the process IDs of each
-	  process and it's parent. Note that this file format is incompatible
-	  with previous v0/v1/v2 file formats, so you will need updated tools
-	  for processing it. A preliminary version of these tools is available
-	  at <http://http://www.de.kernel.org/pub/linux/utils/acct/>.
-
 menu "Class Based Kernel Resource Management"
 
 config CKRM
@@ -175,45 +172,21 @@ config CKRM_RES_NUMTASKS
 config CKRM_CPU_SCHEDULE
 	bool "CKRM CPU scheduler"
 	depends on CKRM_TYPE_TASKCLASS
-	default y
+	default m
 	help
 	  Use CKRM CPU scheduler instead of Linux Scheduler
 	
 	  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
+config CKRM_CPU_MONITOR
+	bool "CKRM CPU Resoure Monitor"
+	depends on CKRM_CPU_SCHEDULE
 	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.
+	  Monitor CPU Resource Usage of the classes
 	
 	  Say N if unsure, Y to use the feature.
 
-config CKRM_RES_MEM
-	bool "Class based physical memory controller"
-	default y
-	depends on CKRM
-	help
-	  Provide the basic support for collecting physical memory usage information
-	  among classes. Say Y if you want to know the memory usage of each class.
-
-config CKRM_MEM_LRUORDER_CHANGE
-	bool "Change the LRU ordering of scanned pages"
-	default n
-	depends on CKRM_RES_MEM
-	help
-	  While trying to free pages, by default(n), scanned pages are left were they
-	  are found if they belong to relatively under-used class. In this case the
-	  LRU ordering of the memory subsystemis left intact. If this option is chosen,
-	  then the scanned pages are moved to the tail of the list(active or inactive).
-	  Changing this to yes reduces the checking overhead but violates the approximate
-	  LRU order that is maintained by the paging subsystem.
-
 config CKRM_TYPE_SOCKETCLASS
 	bool "Class Manager for socket groups"
 	depends on CKRM
@@ -262,6 +235,18 @@ config CKRM_CRBCE
 
 endmenu
 
+config BSD_PROCESS_ACCT_V3
+	bool "BSD Process Accounting version 3 file format"
+	depends on BSD_PROCESS_ACCT
+	default n
+	help
+	  If you say Y here, the process accounting information is written
+	  in a new file format that also logs the process IDs of each
+	  process and it's parent. Note that this file format is incompatible
+	  with previous v0/v1/v2 file formats, so you will need updated tools
+	  for processing it. A preliminary version of these tools is available
+	  at <http://http://www.de.kernel.org/pub/linux/utils/acct/>.
+
 config SYSCTL
 	bool "Sysctl support"
 	---help---
@@ -353,22 +338,6 @@ config IKCONFIG_PROC
 	  This option enables access to the kernel configuration file
 	  through /proc/config.gz.
 
-config OOM_PANIC
-	bool "OOM Panic"
-	default y
-	---help---
-	  This option enables panic() to be called when a system is out of
-	  memory. This feature along with /proc/sys/kernel/panic allows a
-	  different behavior on out-of-memory conditions when the standard
-	  behavior (killing processes in an attempt to recover) does not
-	  make sense.
-
-	  If unsure, say N.
-
-config OOM_KILL
-	bool
-	depends on !OOM_PANIC
-	default y
 
 menuconfig EMBEDDED
 	bool "Configure standard kernel features (for small systems)"