2.6.26-rc1

 lib

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 0796c1a..d2099f4 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -25,6 +25,17 @@ config ENABLE_MUST_CHECK
      suppress the "warning: ignoring return value of 'foo', declared with
      attribute warn_unused_result" messages.
 
+config FRAME_WARN
+   int "Warn for stack frames larger than (needs gcc 4.4)"
+   range 0 8192
+   default 1024 if !64BIT
+   default 2048 if 64BIT
+   help
+     Tell gcc to warn at build time for stack frames larger than this.
+     Setting this too low will cause a lot of warnings.
+     Setting it to 0 disables the warning.
+     Requires gcc 4.4
+
 config MAGIC_SYSRQ
    bool "Magic SysRq key"
    depends on !UML
@@ -183,6 +194,37 @@ config TIMER_STATS
      (it defaults to deactivated on bootup and will only be activated
      if some application like powertop activates it explicitly).
 
+config DEBUG_OBJECTS
+   bool "Debug object operations"
+   depends on DEBUG_KERNEL
+   help
+     If you say Y here, additional code will be inserted into the
+     kernel to track the life time of various objects and validate
+     the operations on those objects.
+
+config DEBUG_OBJECTS_SELFTEST
+   bool "Debug objects selftest"
+   depends on DEBUG_OBJECTS
+   help
+     This enables the selftest of the object debug code.
+
+config DEBUG_OBJECTS_FREE
+   bool "Debug objects in freed memory"
+   depends on DEBUG_OBJECTS
+   help
+     This enables checks whether a k/v free operation frees an area
+     which contains an object which has not been deactivated
+     properly. This can make kmalloc/kfree-intensive workloads
+     much slower.
+
+config DEBUG_OBJECTS_TIMERS
+   bool "Debug timer objects"
+   depends on DEBUG_OBJECTS
+   help
+     If you say Y here, additional code will be inserted into the
+     timer routines to track the life time of timer objects and
+     validate the timer operations.
+
 config DEBUG_SLAB
    bool "Debug slab memory allocations"
    depends on DEBUG_KERNEL && SLAB
@@ -211,7 +253,7 @@ config SLUB_DEBUG_ON
 config SLUB_STATS
    default n
    bool "Enable SLUB performance statistics"
-   depends on SLUB
+   depends on SLUB && SLUB_DEBUG && SYSFS
    help
      SLUB statistics are useful to debug SLUBs allocation behavior in
      order find ways to optimize the allocator. This should never be
@@ -265,16 +307,6 @@ config DEBUG_MUTEXES
     This feature allows mutex semantics violations to be detected and
     reported.
 
-config DEBUG_SEMAPHORE
-   bool "Semaphore debugging"
-   depends on DEBUG_KERNEL
-   depends on ALPHA || FRV
-   default n
-   help
-     If you say Y here then semaphore processing will issue lots of
-     verbose debugging messages.  If you suspect a semaphore problem or a
-     kernel hacker asks for this option then say Y.  Otherwise say N.
-
 config DEBUG_LOCK_ALLOC
    bool "Lock debugging: detect incorrect freeing of live locks"
    depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
@@ -437,6 +469,16 @@ config DEBUG_VM
 
      If unsure, say N.
 
+config DEBUG_WRITECOUNT
+   bool "Debug filesystem writers count"
+   depends on DEBUG_KERNEL
+   help
+     Enable this to catch wrong use of the writers count in struct
+     vfsmount.  This will increase the size of each file struct by
+     32 bits.
+
+     If unsure, say N.
+
 config DEBUG_LIST
    bool "Debug linked list manipulation"
    depends on DEBUG_KERNEL
@@ -593,7 +635,7 @@ config LATENCYTOP
      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"
+   bool "Remote debugging over FireWire early on boot"
    depends on PCI && X86
    help
      If you want to debug problems which hang or crash the kernel early
@@ -621,4 +663,17 @@ config PROVIDE_OHCI1394_DMA_INIT
 
      See Documentation/debugging-via-ohci1394.txt for more information.
 
+config FIREWIRE_OHCI_REMOTE_DMA
+   bool "Remote debugging over FireWire with firewire-ohci"
+   depends on FIREWIRE_OHCI
+   help
+     This option lets you use the FireWire bus for remote debugging
+     with help of the firewire-ohci driver. It enables unfiltered
+     remote DMA in firewire-ohci.
+     See Documentation/debugging-via-ohci1394.txt for more information.
+
+     If unsure, say N.
+
 source "samples/Kconfig"
+
+source "lib/Kconfig.kgdb"