Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 51 insertions, 10 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 234ceb10861f..935248bdbc47 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -103,9 +103,10 @@ config HEADERS_CHECK
 
 config DEBUG_SECTION_MISMATCH
         bool "Enable full Section mismatch analysis"
-        depends on UNDEFINED
+        depends on UNDEFINED || (BLACKFIN)
+        default y
         # This option is on purpose disabled for now.
-        # It will be enabled when we are down to a resonable number
+        # It will be enabled when we are down to a reasonable number
         # of section mismatch warnings (< 10 for an allyesconfig build)
         help
           The section mismatch analysis checks if there are illegal
@@ -298,6 +299,14 @@ config DEBUG_OBJECTS_TIMERS
           timer routines to track the life time of timer objects and
           validate the timer operations.
 
+config DEBUG_OBJECTS_WORK
+        bool "Debug work objects"
+        depends on DEBUG_OBJECTS
+        help
+          If you say Y here, additional code will be inserted into the
+          work queue routines to track the life time of work objects and
+          validate the work operations.
+
 config DEBUG_OBJECTS_ENABLE_DEFAULT
         int "debug_objects bootup default value (0-1)"
         range 0 1
@@ -347,11 +356,12 @@ config SLUB_STATS
 config DEBUG_KMEMLEAK
         bool "Kernel memory leak detector"
         depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
-                (X86 || ARM || PPC || S390)
+                (X86 || ARM || PPC || S390 || SPARC64 || SUPERH || MICROBLAZE)
 
         select DEBUG_FS if SYSFS
         select STACKTRACE if STACKTRACE_SUPPORT
         select KALLSYMS
+        select CRC32
         help
           Say Y here if you want to enable the memory leak
           detector. The memory allocation/freeing is traced in a way
@@ -490,6 +500,18 @@ config PROVE_LOCKING
 
          For more details, see Documentation/lockdep-design.txt.
 
+config PROVE_RCU
+        bool "RCU debugging: prove RCU correctness"
+        depends on PROVE_LOCKING
+        default n
+        help
+         This feature enables lockdep extensions that check for correct
+         use of RCU APIs.  This is currently under development.  Say Y
+         if you want to debug RCU usage or help work on the PROVE_RCU
+         feature.
+
+         Say N if you are unsure.
+
 config LOCKDEP
         bool
         depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
@@ -511,6 +533,14 @@ config LOCK_STAT
 
          For more details, see Documentation/lockstat.txt
 
+         This also enables lock events required by "perf lock",
+         subcommand of perf.
+         If you want to use "perf lock", you also need to turn on
+         CONFIG_EVENT_TRACING.
+
+         CONFIG_LOCK_STAT defines "contended" and "acquired" lock events.
+         (CONFIG_LOCKDEP defines "acquire" and "release" events.)
+
 config DEBUG_LOCKDEP
         bool "Lock dependency engine debugging"
         depends on DEBUG_KERNEL && LOCKDEP
@@ -567,7 +597,7 @@ config DEBUG_BUGVERBOSE
         depends on BUG
         depends on ARM || AVR32 || M32R || M68K || SPARC32 || SPARC64 || \
                    FRV || SUPERH || GENERIC_BUG || BLACKFIN || MN10300
-        default !EMBEDDED
+        default y
         help
           Say Y here to make BUG() panics output the file name and line number
           of the BUG call as well as the EIP and oops trace.  This aids
@@ -750,16 +780,28 @@ config RCU_TORTURE_TEST_RUNNABLE
 config RCU_CPU_STALL_DETECTOR
         bool "Check for stalled CPUs delaying RCU grace periods"
         depends on TREE_RCU || TREE_PREEMPT_RCU
-        default n
+        default y
         help
           This option causes RCU to printk information on which
           CPUs are delaying the current grace period, but only when
           the grace period extends for excessive time periods.
 
-          Say Y if you want RCU to perform such checks.
+          Say N if you want to disable such checks.
+
+          Say Y if you are unsure.
+
+config RCU_CPU_STALL_VERBOSE
+        bool "Print additional per-task information for RCU_CPU_STALL_DETECTOR"
+        depends on RCU_CPU_STALL_DETECTOR && TREE_PREEMPT_RCU
+        default n
+        help
+          This option causes RCU to printk detailed per-task information
+          for any tasks that are stalling the current RCU grace period.
 
           Say N if you are unsure.
 
+          Say Y if you want to enable such checks.
+
 config KPROBES_SANITY_TEST
         bool "Kprobes sanity tests"
         depends on DEBUG_KERNEL
@@ -831,8 +873,7 @@ config DEBUG_FORCE_WEAK_PER_CPU
 
 config LKDTM
         tristate "Linux Kernel Dump Test Tool Module"
-        depends on DEBUG_KERNEL
-        depends on KPROBES
+        depends on DEBUG_FS
         depends on BLOCK
         default n
         help
@@ -843,7 +884,7 @@ config LKDTM
         called lkdtm.
 
         Documentation on how to use the module can be found in
-        drivers/misc/lkdtm.c
+        Documentation/fault-injection/provoke-crashes.txt
 
 config FAULT_INJECTION
         bool "Fault-injection framework"
@@ -912,7 +953,7 @@ config LATENCYTOP
 
 config SYSCTL_SYSCALL_CHECK
         bool "Sysctl checks"
-        depends on SYSCTL_SYSCALL
+        depends on SYSCTL
         ---help---
           sys_sysctl uses binary paths that have been found challenging
           to properly maintain and use. This enables checks that help