From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 May 2011 00:29:29 +0000 (-0700)
Subject: Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0-rc1~406
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=6595b4a940c4c447b619ab5268378ed03e632694;hp=-c

Merge branch 'core-locking-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  seqlock: Don't smp_rmb in seqlock reader spin loop
  watchdog, hung_task_timeout: Add Kconfig configurable default
  lockdep: Remove cmpxchg to update nr_chain_hlocks
  lockdep: Print a nicer description for simple irq lock inversions
  lockdep: Replace "Bad BFS generated tree" message with something less cryptic
  lockdep: Print a nicer description for irq inversion bugs
  lockdep: Print a nicer description for simple deadlocks
  lockdep: Print a nicer description for normal deadlocks
  lockdep: Print a nicer description for irq lock inversions
---

6595b4a940c4c447b619ab5268378ed03e632694
diff --combined lib/Kconfig.debug
index 17ac5f87182d,debbb0580bf0..9b1707b5f646
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -238,6 -238,21 +238,21 @@@ config DETECT_HUNG_TAS
  	  enabled then all held locks will also be reported. This
  	  feature has negligible overhead.
  
+ config DEFAULT_HUNG_TASK_TIMEOUT
+ 	int "Default timeout for hung task detection (in seconds)"
+ 	depends on DETECT_HUNG_TASK
+ 	default 120
+ 	help
+ 	  This option controls the default timeout (in seconds) used
+ 	  to determine when a task has become non-responsive and should
+ 	  be considered hung.
+ 
+ 	  It can be adjusted at runtime via the kernel.hung_task_timeout
+ 	  sysctl or by writing a value to /proc/sys/kernel/hung_task_timeout.
+ 
+ 	  A timeout of 0 disables the check.  The default is two minutes.
+ 	  Keeping the default should be fine in most cases.
+ 
  config BOOTPARAM_HUNG_TASK_PANIC
  	bool "Panic (Reboot) On Hung Tasks"
  	depends on DETECT_HUNG_TASK
@@@ -398,9 -413,9 +413,9 @@@ config SLUB_STAT
  config DEBUG_KMEMLEAK
  	bool "Kernel memory leak detector"
  	depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
 -		(X86 || ARM || PPC || S390 || SPARC64 || SUPERH || MICROBLAZE || TILE)
 +		(X86 || ARM || PPC || MIPS || S390 || SPARC64 || SUPERH || MICROBLAZE || TILE)
  
 -	select DEBUG_FS if SYSFS
 +	select DEBUG_FS
  	select STACKTRACE if STACKTRACE_SUPPORT
  	select KALLSYMS
  	select CRC32