Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[mv-sheeva.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index a7e48796d571f5bc02f76aeafc54df8ddd6a8cbc..e63a017c391eb23b11ae5769f19cabf5cfb7dae8 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -502,6 +502,15 @@ config VM_EVENT_COUNTERS
          on EMBEDDED systems.  /proc/vmstat will only show page counts
          if VM event counters are disabled.
 
+config SLUB_DEBUG
+       default y
+       bool "Enable SLUB debugging support" if EMBEDDED
+       help
+         SLUB has extensive debug support features. Disabling these can
+         result in significant savings in code size. This also disables
+         SLUB sysfs support. /sys/slab will not exist and there will be
+         no support for cache validation etc.
+
 choice
        prompt "Choose SLAB allocator"
        default SLAB
@@ -512,9 +521,9 @@ config SLAB
        bool "SLAB"
        help
          The regular slab allocator that is established and known to work
-         well in all environments. It organizes chache hot objects in
+         well in all environments. It organizes cache hot objects in
          per cpu and per node queues. SLAB is the default choice for
-         slab allocator.
+         a slab allocator.
 
 config SLUB
        depends on EXPERIMENTAL && !ARCH_USES_SLAB_PAGE_STRUCT
@@ -524,21 +533,20 @@ config SLUB
           instead of managing queues of cached objects (SLAB approach).
           Per cpu caching is realized using slabs of objects instead
           of queues of objects. SLUB can use memory efficiently
-          way and has enhanced diagnostics.
+          and has enhanced diagnostics.
 
 config SLOB
 #
-#      SLOB cannot support SMP because SLAB_DESTROY_BY_RCU does not work
-#      properly.
+#      SLOB does not support SMP because SLAB_DESTROY_BY_RCU is unsupported
 #
        depends on EMBEDDED && !SMP && !SPARSEMEM
        bool "SLOB (Simple Allocator)"
        help
           SLOB replaces the SLAB allocator with a drastically simpler
           allocator.  SLOB is more space efficient that SLAB but does not
-          scale well (single lock for all operations) and is more susceptible
-          to fragmentation. SLOB it is a great choice to reduce
-          memory usage and code size for embedded systems.
+          scale well (single lock for all operations) and is also highly
+          susceptible to fragmentation. SLUB can accomplish a higher object
+          density. It is usually better to use SLUB instead of SLOB.
 
 endchoice