|author||Ingo Molnar <email@example.com>||2009-04-14 11:32:23 +0200|
|committer||Ingo Molnar <firstname.lastname@example.org>||2009-04-14 11:32:30 +0200|
Merge branch 'core/urgent' into core/rcu
Merge reason: new patches to be queued up depend on: ef631b0: rcu: Make hierarchical RCU less IPI-happy Signed-off-by: Ingo Molnar <email@example.com>
Diffstat (limited to 'init/Kconfig')
1 files changed, 38 insertions, 8 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 26ac8772464..d4e9671347e 100644
@@ -208,6 +208,12 @@ config POSIX_MQUEUE
If unsure, say Y.
+ depends on POSIX_MQUEUE
+ depends on SYSCTL
+ default y
bool "BSD Process Accounting"
@@ -531,7 +537,7 @@ config CGROUP_DEVICE
bool "Cpuset support"
- depends on SMP && CGROUPS
+ depends on CGROUPS
This option will let you create and manage CPUSETs which
allow dynamically partitioning a system into sets of CPUs and
@@ -565,7 +571,7 @@ config CGROUP_MEM_RES_CTLR
Provides a memory resource controller that manages both anonymous
- memory and page cache. (See Documentation/controllers/memory.txt)
+ memory and page cache. (See Documentation/cgroups/memory.txt)
Note that setting this option increases fixed memory overhead
associated with each page of memory in the system. By this,
@@ -597,6 +603,8 @@ config CGROUP_MEM_RES_CTLR_SWAP
is disabled by boot option, this will be automatically disabled and
there will be no overhead from this. Even when you set this config=y,
if boot option "noswapaccount" is set, swap will not be accounted.
+ Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
+ size is 4096bytes, 512k per 1Gbytes of swap.
endif # CGROUPS
@@ -668,10 +676,10 @@ config UTS_NS
bool "IPC namespace"
- depends on NAMESPACES && SYSVIPC
+ depends on NAMESPACES && (SYSVIPC || POSIX_MQUEUE)
In this namespace tasks work with IPC ids which correspond to
- different IPC objects in different namespaces
+ different IPC objects in different namespaces.
bool "User namespace (EXPERIMENTAL)"
@@ -687,7 +695,7 @@ config PID_NS
depends on NAMESPACES && EXPERIMENTAL
Support process id namespaces. This allows having multiple
- process with the same pid as long as they are in different
+ processes with the same pid as long as they are in different
pid namespaces. This is a building block of containers.
Unless you want to work with an experimental feature
@@ -800,6 +808,14 @@ config KALLSYMS_EXTRA_PASS
you wait for kallsyms to be fixed.
+ bool "Strip assembler-generated symbols during link"
+ default n
+ Strip internal assembler-generated symbols during a link (symbols
+ that look like '.Lxxx') so they don't pollute the output of
+ get_wchan() and suchlike.
bool "Support for hot-pluggable devices" if EMBEDDED
@@ -952,7 +968,7 @@ config COMPAT_BRK
Randomizing heap placement makes heap exploits harder, but it
also breaks ancient binaries (including anything libc5 based).
This option changes the bootup default to heap randomization
- disabled, and can be overriden runtime by setting
+ disabled, and can be overridden at runtime by setting
/proc/sys/kernel/randomize_va_space to 2.
On non-ancient distros (post-2000 ones) N is usually a safe choice.
@@ -1005,13 +1021,27 @@ config TRACEPOINTS
bool "Activate markers"
- depends on TRACEPOINTS
+ select TRACEPOINTS
Place an empty function call at each marker site. Can be
dynamically changed for a probe function.
+ default n
+ The slow work thread pool provides a number of dynamically allocated
+ threads that can be used by the kernel to perform operations that
+ take a relatively long time.
+ An example of this would be CacheFiles doing a path lookup followed
+ by a series of mkdirs and a create call, all of which have to touch
+ See Documentation/slow-work.txt.
endmenu # General setup
@@ -1110,7 +1140,7 @@ config INIT_ALL_POSSIBLE
cpu_possible_map, some of them chose to initialize cpu_possible_map
with all 1s, and others with all 0s. When they were centralised,
it was better to provide this option than to break all the archs
- and have several arch maintainers persuing me down dark alleys.
+ and have several arch maintainers pursuing me down dark alleys.