2.6.25-rc7

 lib

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index a601093..0796c1a 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -79,6 +79,41 @@ config HEADERS_CHECK
      exported to $(INSTALL_HDR_PATH) (usually 'usr/include' in
      your build tree), to make sure they're suitable.
 
+config DEBUG_SECTION_MISMATCH
+   bool "Enable full Section mismatch analysis"
+   depends on UNDEFINED
+   # This option is on purpose disabled for now.
+   # It will be enabled when we are down to a resonable number
+   # of section mismatch warnings (< 10 for an allyesconfig build)
+   help
+     The section mismatch analysis checks if there are illegal
+     references from one section to another section.
+     Linux will during link or during runtime drop some sections
+     and any use of code/data previously in these sections will
+     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 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
+       function we would lose the section information and thus
+       the analysis would not catch the illegal reference.
+       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
+       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
+       source. The drawback is that we will report the same
+       mismatch at least twice.
+     - Enable verbose reporting from modpost to help solving
+       the section mismatches reported.
+
 config DEBUG_KERNEL
    bool "Kernel debugging"
    help
@@ -173,6 +208,19 @@ config SLUB_DEBUG_ON
      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)
@@ -359,7 +407,8 @@ config DEBUG_HIGHMEM
 config DEBUG_BUGVERBOSE
    bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
    depends on BUG
-   depends on ARM || AVR32 || M32R || M68K || SPARC32 || SPARC64 || FRV || SUPERH || GENERIC_BUG || BLACKFIN
+   depends on ARM || AVR32 || M32R || M68K || SPARC32 || SPARC64 || \
+         FRV || SUPERH || GENERIC_BUG || BLACKFIN || MN10300
    default !EMBEDDED
    help
      Say Y here to make BUG() panics output the file name and line number
@@ -409,7 +458,9 @@ config DEBUG_SG
 
 config FRAME_POINTER
    bool "Compile the kernel with frame pointers"
-   depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390 || AVR32 || SUPERH || BLACKFIN)
+   depends on DEBUG_KERNEL && \
+      (X86 || CRIS || M68K || M68KNOMMU || FRV || UML || S390 || \
+       AVR32 || SUPERH || BLACKFIN || MN10300)
    default y if DEBUG_INFO && UML
    help
      If you say Y here the resulting kernel image will be slightly larger
@@ -417,20 +468,6 @@ config FRAME_POINTER
      some architectures or if you use external debuggers.
      If you don't debug the kernel, you can say N.
 
-config FORCED_INLINING
-   bool "Force gcc to inline functions marked 'inline'"
-   depends on DEBUG_KERNEL
-   default y
-   help
-     This option determines if the kernel forces gcc to inline the functions
-     developers have marked 'inline'. Doing so takes away freedom from gcc to
-     do what it thinks is best, which is desirable for the gcc 3.x series of
-     compilers. The gcc 4.x series have a rewritten inlining algorithm and
-     disabling this option will generate a smaller kernel there. Hopefully
-     this algorithm is so good that allowing gcc4 to make the decision can
-     become the default in the future, until then this option is there to
-     test gcc for this.
-
 config BOOT_PRINTK_DELAY
    bool "Delay each boot printk message by N milliseconds"
    depends on DEBUG_KERNEL && PRINTK && GENERIC_CALIBRATE_DELAY
@@ -462,10 +499,35 @@ config RCU_TORTURE_TEST
      Say M if you want the RCU torture tests to build as a module.
      Say N if you are unsure.
 
+config KPROBES_SANITY_TEST
+   bool "Kprobes sanity tests"
+   depends on DEBUG_KERNEL
+   depends on KPROBES
+   default n
+   help
+     This option provides for testing basic kprobes functionality on
+     boot. A sample kprobe, jprobe and kretprobe are inserted and
+     verified for functionality.
+
+     Say N if you are unsure.
+
+config BACKTRACE_SELF_TEST
+   tristate "Self test for the backtrace code"
+   depends on DEBUG_KERNEL
+   default n
+   help
+     This option provides a kernel module that can be used to test
+     the kernel stack backtrace code. This option is not useful
+     for distributions or general kernels, but only for kernel
+     developers working on architecture code.
+
+     Say N if you are unsure.
+
 config LKDTM
    tristate "Linux Kernel Dump Test Tool Module"
    depends on DEBUG_KERNEL
    depends on KPROBES
+   depends on BLOCK
    default n
    help
    This module enables testing of the different dumping mechanisms by
@@ -517,4 +579,46 @@ config FAULT_INJECTION_STACKTRACE_FILTER
    help
      Provide stacktrace filter for fault-injection capabilities
 
+config LATENCYTOP
+   bool "Latency measuring infrastructure"
+   select FRAME_POINTER if !MIPS
+   select KALLSYMS
+   select KALLSYMS_ALL
+   select STACKTRACE
+   select SCHEDSTATS
+   select SCHED_DEBUG
+   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.
+
+config PROVIDE_OHCI1394_DMA_INIT
+   bool "Provide code for enabling DMA over FireWire early on boot"
+   depends on PCI && X86
+   help
+     If you want to debug problems which hang or crash the kernel early
+     on boot and the crashing machine has a FireWire port, you can use
+     this feature to remotely access the memory of the crashed machine
+     over FireWire. This employs remote DMA as part of the OHCI1394
+     specification which is now the standard for FireWire controllers.
+
+     With remote DMA, you can monitor the printk buffer remotely using
+     firescope and access all memory below 4GB using fireproxy from gdb.
+     Even controlling a kernel debugger is possible using remote DMA.
+
+     Usage:
+
+     If ohci1394_dma=early is used as boot parameter, it will initialize
+     all OHCI1394 controllers which are found in the PCI config space.
+
+     As all changes to the FireWire bus such as enabling and disabling
+     devices cause a bus reset and thereby disable remote DMA for all
+     devices, be sure to have the cable plugged and FireWire enabled on
+     the debugging host before booting the debug target for debugging.
+
+     This code (~1k) is freed after boot. By then, the firewire stack
+     in charge of the OHCI-1394 controllers should be used instead.
+
+     See Documentation/debugging-via-ohci1394.txt for more information.
+
 source "samples/Kconfig"