Merge branch 'master' into for-linus

Conflicts:
	include/linux/percpu.h
	mm/percpu.c

diff --combined lib/Kconfig.debug
index b626365,7b2a8ca..69a3266
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -353,7 -353,7 +353,7 @@@ config SLUB_DEBUG_O
  config SLUB_STATS
        default n
        bool "Enable SLUB performance statistics"
 -      depends on SLUB && SLUB_DEBUG && SYSFS
 +      depends on SLUB && SYSFS
        help
          SLUB statistics are useful to debug SLUBs allocation behavior in
          order find ways to optimize the allocator. This should never be
@@@ -461,6 -461,15 +461,15 @@@ config DEBUG_MUTEXE
         This feature allows mutex semantics violations to be detected and
         reported.
  
+ config BKL
+       bool "Big Kernel Lock" if (SMP || PREEMPT)
+       default y
+       help
+         This is the traditional lock that is used in old code instead
+         of proper locking. All drivers that use the BKL should depend
+         on this symbol.
+         Say Y here unless you are working on removing the BKL.
+ 
  config DEBUG_LOCK_ALLOC
        bool "Lock debugging: detect incorrect freeing of live locks"
        depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
@@@ -482,6 -491,7 +491,7 @@@ config PROVE_LOCKIN
        select DEBUG_SPINLOCK
        select DEBUG_MUTEXES
        select DEBUG_LOCK_ALLOC
+       select TRACE_IRQFLAGS
        default n
        help
         This feature enables the kernel to prove that all locking
@@@ -539,6 -549,23 +549,23 @@@ config PROVE_RCU_REPEATEDL
         disabling, allowing multiple RCU-lockdep warnings to be printed
         on a single reboot.
  
+        Say Y to allow multiple RCU-lockdep warnings per boot.
+ 
+        Say N if you are unsure.
+ 
+ config SPARSE_RCU_POINTER
+       bool "RCU debugging: sparse-based checks for pointer usage"
+       default n
+       help
+        This feature enables the __rcu sparse annotation for
+        RCU-protected pointers.  This annotation will cause sparse
+        to flag any non-RCU used of annotated pointers.  This can be
+        helpful when debugging RCU usage.  Please note that this feature
+        is not intended to enforce code cleanliness; it is instead merely
+        a debugging aid.
+ 
+        Say Y to make sparse flag questionable use of RCU-protected pointers
+ 
         Say N if you are unsure.
  
  config LOCKDEP
@@@ -579,11 -606,10 +606,10 @@@ config DEBUG_LOCKDE
          of more runtime overhead.
  
  config TRACE_IRQFLAGS
-       depends on DEBUG_KERNEL
        bool
-       default y
-       depends on TRACE_IRQFLAGS_SUPPORT
-       depends on PROVE_LOCKING
+       help
+         Enables hooks to interrupt enabling and disabling for
+         either tracing or lock debugging.
  
  config DEBUG_SPINLOCK_SLEEP
        bool "Spinlock debugging: sleep-inside-spinlock checking"
@@@ -832,6 -858,30 +858,30 @@@ config RCU_CPU_STALL_DETECTO
  
          Say Y if you are unsure.
  
+ config RCU_CPU_STALL_TIMEOUT
+       int "RCU CPU stall timeout in seconds"
+       depends on RCU_CPU_STALL_DETECTOR
+       range 3 300
+       default 60
+       help
+         If a given RCU grace period extends more than the specified
+         number of seconds, a CPU stall warning is printed.  If the
+         RCU grace period persists, additional CPU stall warnings are
+         printed at more widely spaced intervals.
+ 
+ config RCU_CPU_STALL_DETECTOR_RUNNABLE
+       bool "RCU CPU stall checking starts automatically at boot"
+       depends on RCU_CPU_STALL_DETECTOR
+       default y
+       help
+         If set, start checking for RCU CPU stalls immediately on
+         boot.  Otherwise, RCU CPU stall checking must be manually
+         enabled.
+ 
+         Say Y if you are unsure.
+ 
+         Say N if you wish to suppress RCU CPU stall checking during boot.
+ 
  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