summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-11-09 17:17:09 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2009-11-09 17:17:09 +1100
commitebb02831501849dfe7d9299763647bdf13d7c50b (patch)
tree18c44134a161b0f35427d6a1fce4e8aa9216a50d /init
parentdfe7260e037bccff1b5ffe1a37a4beadfc0ab75f (diff)
parent13655f0f015f02f5fad216c70be58dc41edf0215 (diff)
Merge remote branch 'tip/auto-latest'
Conflicts: arch/x86/kernel/kgdb.c
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig13
1 files changed, 11 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 9047f8f03479..f6ae79ffefa8 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -338,6 +338,15 @@ config TREE_PREEMPT_RCU
is also required. It also scales down nicely to
smaller systems.
+config TINY_RCU
+ bool "UP-only small-memory-footprint RCU"
+ depends on !SMP
+ help
+ This option selects the RCU implementation that is
+ designed for UP systems from which real-time response
+ is not required. This option greatly reduces the
+ memory footprint of RCU.
+
endchoice
config RCU_TRACE
@@ -941,7 +950,7 @@ config PERF_EVENTS
Enable kernel support for various performance events provided
by software and hardware.
- Software events are supported either build-in or via the
+ Software events are supported either built-in or via the
use of generic tracepoints.
Most modern CPUs support performance events via performance
@@ -953,7 +962,7 @@ config PERF_EVENTS
used to profile the code that runs on that CPU.
The Linux Performance Event subsystem provides an abstraction of
- these software and hardware cevent apabilities, available via a
+ these software and hardware event capabilities, available via a
system call and used by the "perf" utility in tools/perf/. It
provides per task and per CPU counters, and it provides event
capabilities on top of those.