aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-18 15:54:49 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-18 15:54:49 -0500
commitd110ec3a1e1f522e2e9dfceb9c36d6590c26d2d4 (patch)
tree86b2f8f1d22b74b05239525c55bd42e3db6afc03 /init
parent343e9099c8152daff20e10d6269edec21da44fc0 (diff)
parent55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff)
Merge branch 'linus' into core/rcu
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 86b00c53fade..f763762d544a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -354,7 +354,7 @@ config RT_GROUP_SCHED
354 setting below. If enabled, it will also make it impossible to 354 setting below. If enabled, it will also make it impossible to
355 schedule realtime tasks for non-root users until you allocate 355 schedule realtime tasks for non-root users until you allocate
356 realtime bandwidth for them. 356 realtime bandwidth for them.
357 See Documentation/sched-rt-group.txt for more information. 357 See Documentation/scheduler/sched-rt-group.txt for more information.
358 358
359choice 359choice
360 depends on GROUP_SCHED 360 depends on GROUP_SCHED
@@ -771,8 +771,7 @@ config SLAB
771 help 771 help
772 The regular slab allocator that is established and known to work 772 The regular slab allocator that is established and known to work
773 well in all environments. It organizes cache hot objects in 773 well in all environments. It organizes cache hot objects in
774 per cpu and per node queues. SLAB is the default choice for 774 per cpu and per node queues.
775 a slab allocator.
776 775
777config SLUB 776config SLUB
778 bool "SLUB (Unqueued Allocator)" 777 bool "SLUB (Unqueued Allocator)"
@@ -781,7 +780,8 @@ config SLUB
781 instead of managing queues of cached objects (SLAB approach). 780 instead of managing queues of cached objects (SLAB approach).
782 Per cpu caching is realized using slabs of objects instead 781 Per cpu caching is realized using slabs of objects instead
783 of queues of objects. SLUB can use memory efficiently 782 of queues of objects. SLUB can use memory efficiently
784 and has enhanced diagnostics. 783 and has enhanced diagnostics. SLUB is the default choice for
784 a slab allocator.
785 785
786config SLOB 786config SLOB
787 depends on EMBEDDED 787 depends on EMBEDDED