X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=init%2FKconfig;h=0c2ab8b39eb0fe8ac13a93913a3520ac42fbf14e;hb=44c40f29869a02dd430beb7fed0b6ca7d8ef5e54;hp=509119525f25e8212fad926b78ccb2c40c541f88;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git diff --git a/init/Kconfig b/init/Kconfig index 509119525..0c2ab8b39 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -50,11 +50,6 @@ config BROKEN_ON_SMP depends on BROKEN || !SMP default y -config LOCK_KERNEL - bool - depends on SMP || PREEMPT - default y - endmenu menu "General setup" @@ -90,6 +85,8 @@ config SYSVIPC you want to run the DOS emulator dosemu under Linux (read the DOSEMU-HOWTO, available from ), you'll need to say Y here. + DOSEMU-HOWTO, available from ), + 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 @@ -153,19 +150,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 && RCFS_FS + depends on CKRM help TASKCLASS provides the extensions for CKRM to track task classes This is the base to enable task class based resource control for @@ -173,51 +170,16 @@ config CKRM_TYPE_TASKCLASS Say N if unsure -config CKRM_RES_NULL - tristate "Null Tasks Resource Manager" - depends on CKRM_TYPE_TASKCLASS - default m - -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_TYPE_SOCKETCLASS - bool "Class Manager for socket groups" - depends on CKRM && RCFS_FS - help - Provides a Null Resource Controller for CKRM that is purely for - demonstration purposes. - - Say N if unsure, Y to use the feature. - - config CKRM_RES_NUMTASKS tristate "Number of Tasks Resource Manager" depends on CKRM_TYPE_TASKCLASS default m help - Provides a Resource Controller for CKRM that allows limiting number of + Provides a Resource Controller for CKRM that allows limiting no of tasks a task class can have. Say N if unsure, Y to use the feature. -config CKRM_RES_NUMTASKS_FORKRATE - tristate "Number of Tasks Resource Manager for Fork Rate" - depends on CKRM_RES_NUMTASKS - default y - help - Provides a Resource Controller for CKRM that allows limiting the rate - of tasks a task class can fork per hour. - - Say N if unsure, Y to use the feature. - - config CKRM_CPU_SCHEDULE bool "CKRM CPU scheduler" depends on CKRM_TYPE_TASKCLASS @@ -240,6 +202,26 @@ config CKRM_RES_BLKIO 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_CPU_SCHEDULE_AT_BOOT bool "Turn on at boot time" depends on CKRM_CPU_SCHEDULE @@ -274,48 +256,29 @@ 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 RBCE" + tristate "Vanilla Rule-based Classification Engine (RBCE)" + depends on CKRM && RCFS_FS + default m help - 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. + 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 RBCE" - depends on DELAY_ACCT && RELAYFS_FS + tristate "Enhanced Rule-based Classification Engine (RBCE)" + depends on CKRM && RCFS_FS && RELAYFS_FS && DELAY_ACCT + default m help - 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). + 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). - Any CE is optional. If unsure, say N. - -endchoice + If unsure, say N. endmenu @@ -357,7 +320,7 @@ config AUDITSYSCALL config LOG_BUF_SHIFT int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL - range 12 21 + range 12 20 default 17 if ARCH_S390 default 16 if X86_NUMAQ || IA64 default 15 if SMP @@ -391,25 +354,6 @@ config HOTPLUG agent" (/sbin/hotplug) to load modules and set up software needed to use devices as you hotplug them. -config KOBJECT_UEVENT - bool "Kernel Userspace Events" - depends on NET - default y - help - This option enables the kernel userspace event layer, which is a - simple mechanism for kernel-to-user communication over a netlink - socket. - The goal of the kernel userspace events layer is to provide a simple - and efficient events system, that notifies userspace about kobject - state changes. This will enable applications to just listen for - events instead of polling system devices and files. - Hotplug events (kobject addition and removal) are also available on - the netlink socket in addition to the execution of /sbin/hotplug if - CONFIG_HOTPLUG is enabled. - - Say Y, unless you are building a system requiring minimal memory - consumption. - config IKCONFIG bool "Kernel .config support" ---help--- @@ -462,6 +406,7 @@ config DELAY_ACCT I/O delays are recorded for memory and regular I/O. Information is accessible through /proc//delay. + config KALLSYMS bool "Load all symbols for debugging/kksymoops" if EMBEDDED default y @@ -507,6 +452,8 @@ config EPOLL Disabling this option will cause the kernel to be built without support for epoll family of system calls. +source "drivers/block/Kconfig.iosched" + config CC_OPTIMIZE_FOR_SIZE bool "Optimize for size" default y if ARM || H8300 @@ -530,43 +477,6 @@ config SHMEM option replaces shmem and tmpfs with the much simpler ramfs code, which may be appropriate on small systems without swap. -config CC_ALIGN_FUNCTIONS - int "Function alignment" if EMBEDDED - default 0 - help - Align the start of functions to the next power-of-two greater than n, - skipping up to n bytes. For instance, 32 aligns functions - to the next 32-byte boundary, but 24 would align to the next - 32-byte boundary only if this can be done by skipping 23 bytes or less. - Zero means use compiler's default. - -config CC_ALIGN_LABELS - int "Label alignment" if EMBEDDED - default 0 - help - Align all branch targets to a power-of-two boundary, skipping - up to n bytes like ALIGN_FUNCTIONS. This option can easily - make code slower, because it must insert dummy operations for - when the branch target is reached in the usual flow of the code. - Zero means use compiler's default. - -config CC_ALIGN_LOOPS - int "Loop alignment" if EMBEDDED - default 0 - help - Align loops to a power-of-two boundary, skipping up to n bytes. - Zero means use compiler's default. - -config CC_ALIGN_JUMPS - int "Jump alignment" if EMBEDDED - default 0 - help - Align branch targets to a power-of-two boundary, for branch - targets where the targets can only be reached by jumping, - skipping up to n bytes like ALIGN_FUNCTIONS. In this case, - no dummy operations need be executed. - Zero means use compiler's default. - endmenu # General setup config TINY_SHMEM @@ -634,18 +544,6 @@ config MODVERSIONS make them incompatible with the kernel you are running. If unsure, say N. -config MODULE_SRCVERSION_ALL - bool "Source checksum for all modules" - depends on MODULES - help - Modules which contain a MODULE_VERSION get an extra "srcversion" - field inserted into their modinfo section, which contains a - sum of the source files which made it. This helps maintainers - see exactly which source was used to build a module (since - others sometimes change the module source without updating - the version). With this option, such a "srcversion" field - will be created for all modules. If unsure, say N. - config MODULE_SIG bool "Module signature verification (EXPERIMENTAL)" depends on MODULES && EXPERIMENTAL