Merge branches 'release', 'dmi' and 'misc' into release

[linux-2.6] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 89f4035b526c147de3115794fa2cbd55b25db8ab..4f4008fc73e42d2c6aa66349ba82c78c243fb2c1 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -81,7 +81,7 @@ config HEADERS_CHECK
 
 config DEBUG_SECTION_MISMATCH
        bool "Enable full Section mismatch analysis"
 
 config DEBUG_SECTION_MISMATCH
        bool "Enable full Section mismatch analysis"

-       default n
+       depends on UNDEFINED

        help
          The section mismatch analysis checks if there are illegal
          references from one section to another section.
        help
          The section mismatch analysis checks if there are illegal
          references from one section to another section.


@@ -90,19 +90,19 @@ config DEBUG_SECTION_MISMATCH
          most likely result in an oops.
          In the code functions and variables are annotated with
          __init, __devinit etc. (see full list in include/linux/init.h)
          most likely result in an oops.
          In the code functions and variables are annotated with
          __init, __devinit etc. (see full list in include/linux/init.h)

-         which result in the code/data being placed in specific sections.
-         The section mismatch anaylsis are always done after a full
-         kernel build but enabling this options will in addition
+         which results in the code/data being placed in specific sections.
+         The section mismatch analysis is always done after a full
+         kernel build but enabling this option will in addition

          do the following:
          - Add the option -fno-inline-functions-called-once to gcc
            When inlining a function annotated __init in a non-init
          do the following:
          - Add the option -fno-inline-functions-called-once to gcc
            When inlining a function annotated __init in a non-init

-           function we would loose the section information and thus
+           function we would lose the section information and thus

            the analysis would not catch the illegal reference.
            the analysis would not catch the illegal reference.

-           This options tell gcc to inline less but will also
+           This option tells gcc to inline less but will also

            result in a larger kernel.
          - Run the section mismatch analysis for each module/built-in.o
            When we run the section mismatch analysis on vmlinux.o we
            result in a larger kernel.
          - Run the section mismatch analysis for each module/built-in.o
            When we run the section mismatch analysis on vmlinux.o we

-           looses valueable information about where the mismatch was
+           lose valueble information about where the mismatch was

            introduced.
            Running the analysis for each module/built-in.o file
            will tell where the mismatch happens much closer to the
            introduced.
            Running the analysis for each module/built-in.o file
            will tell where the mismatch happens much closer to the


@@ -205,6 +205,19 @@ config SLUB_DEBUG_ON
          off in a kernel built with CONFIG_SLUB_DEBUG_ON by specifying
          "slub_debug=-".
 
          off in a kernel built with CONFIG_SLUB_DEBUG_ON by specifying
          "slub_debug=-".
 

+config SLUB_STATS
+       default n
+       bool "Enable SLUB performance statistics"
+       depends on SLUB
+       help
+         SLUB statistics are useful to debug SLUBs allocation behavior in
+         order find ways to optimize the allocator. This should never be
+         enabled for production use since keeping statistics slows down
+         the allocator by a few percentage points. The slabinfo command
+         supports the determination of the most active slabs to figure
+         out which slabs are relevant to a particular load.
+         Try running: slabinfo -DA
+

 config DEBUG_PREEMPT
        bool "Debug preemptible kernel"
        depends on DEBUG_KERNEL && PREEMPT && (TRACE_IRQFLAGS_SUPPORT || PPC64)
 config DEBUG_PREEMPT
        bool "Debug preemptible kernel"
        depends on DEBUG_KERNEL && PREEMPT && (TRACE_IRQFLAGS_SUPPORT || PPC64)


@@ -581,7 +594,7 @@ config LATENCYTOP
        select STACKTRACE
        select SCHEDSTATS
        select SCHED_DEBUG
        select STACKTRACE
        select SCHEDSTATS
        select SCHED_DEBUG

-       depends on X86 || X86_64
+       depends on HAVE_LATENCYTOP_SUPPORT

        help
          Enable this option if you want to use the LatencyTOP tool
          to find out which userspace is blocking on what kernel operations.
        help
          Enable this option if you want to use the LatencyTOP tool
          to find out which userspace is blocking on what kernel operations.