Merge branch 'linus' into tracing/kmemtrace

[mv-sheeva.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 2e75478e9c696bc6933ca8952c0a013dd30eb78a..aafb82dfb8aab79dfaf1f57ebbe3be44d54ce6e9 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -835,6 +835,26 @@ config FIREWIRE_OHCI_REMOTE_DMA
 
          If unsure, say N.
 
+config KMEMTRACE
+       bool "Kernel memory tracer (kmemtrace)"
+       depends on RELAY && DEBUG_FS && MARKERS
+       help
+         kmemtrace provides tracing for slab allocator functions, such as
+         kmalloc, kfree, kmem_cache_alloc, kmem_cache_free etc.. Collected
+         data is then fed to the userspace application in order to analyse
+         allocation hotspots, internal fragmentation and so on, making it
+         possible to see how well an allocator performs, as well as debug
+         and profile kernel code.
+
+         This requires an userspace application to use. See
+         Documentation/vm/kmemtrace.txt for more information.
+
+         Saying Y will make the kernel somewhat larger and slower. However,
+         if you disable kmemtrace at run-time or boot-time, the performance
+         impact is minimal (depending on the arch the kernel is built for).
+
+         If unsure, say N.
+
 menuconfig BUILD_DOCSRC
        bool "Build targets in Documentation/ tree"
        depends on HEADERS_CHECK