Merge branches 'core/debugobjects', 'core/iommu', 'core/locking', 'core/printk',...

diff --combined kernel/softirq.c
index e7c69a720d69a0a7d9166c21883e05d2521cb26a,e7c69a720d69a0a7d9166c21883e05d2521cb26a,e7c69a720d69a0a7d9166c21883e05d2521cb26a,e7c69a720d69a0a7d9166c21883e05d2521cb26a,e7c69a720d69a0a7d9166c21883e05d2521cb26a,80d323e6f61a352a2a25a7e8df82d337df995464,e7c69a720d69a0a7d9166c21883e05d2521cb26a,8d9934b4162aee2215fc9d7e13c639b90533e398,e7c69a720d69a0a7d9166c21883e05d2521cb26a..466e75ce271aa0795ac50266d9d3bc2acdde7261
--- 1/kernel/softirq.c
--- 2/kernel/softirq.c
--- 3/kernel/softirq.c
--- 4/kernel/softirq.c
--- 5/kernel/softirq.c
--- 6/kernel/softirq.c
--- 7/kernel/softirq.c
--- 8/kernel/softirq.c
--- 9/kernel/softirq.c
+++ b/kernel/softirq.c
@@@@@@@@@@ -102,20 -102,20 -102,20 -102,20 -102,20 -102,20 -102,20 -102,6 -102,20 +102,6 @@@@@@@@@@ void local_bh_disable(void
         
         EXPORT_SYMBOL(local_bh_disable);
         
------- -void __local_bh_enable(void)
------- -{
------- -       WARN_ON_ONCE(in_irq());
------- -
------- -       /*
------- -        * softirqs should never be enabled by __local_bh_enable(),
------- -        * it always nests inside local_bh_enable() sections:
------- -        */
------- -       WARN_ON_ONCE(softirq_count() == SOFTIRQ_OFFSET);
------- -
------- -       sub_preempt_count(SOFTIRQ_OFFSET);
------- -}
------- -EXPORT_SYMBOL_GPL(__local_bh_enable);
------- -
         /*
          * Special-case - softirqs can safely be enabled in
          * cond_resched_softirq(), or by __do_softirq(),
@@@@@@@@@@ -269,6 -269,6 -269,6 -269,6 -269,6 -269,7 -269,6 -255,6 -269,6 +255,7 @@@@@@@@@@ void irq_enter(void
         {
                int cpu = smp_processor_id();
         
+++++ +++       rcu_irq_enter();
                if (idle_cpu(cpu) && !in_interrupt()) {
                        __irq_enter();
                        tick_check_idle(cpu);
@@@@@@@@@@ -295,9 -295,9 -295,9 -295,9 -295,9 -296,9 -295,9 -281,9 -295,9 +282,9 @@@@@@@@@@ void irq_exit(void
         
         #ifdef CONFIG_NO_HZ
                /* Make sure that timer wheel updates are propagated */
----- ---       if (!in_interrupt() && idle_cpu(smp_processor_id()) && !need_resched())
----- ---               tick_nohz_stop_sched_tick(0);
                rcu_irq_exit();
+++++ +++       if (idle_cpu(smp_processor_id()) && !in_interrupt() && !need_resched())
+++++ +++               tick_nohz_stop_sched_tick(0);
         #endif
                preempt_enable_no_resched();
         }

diff --combined lib/Kconfig.debug
index 1e3fd3e3436abf6e142c9f0b46cc6993cd19ec38,124ece1e67ad4d3225e021079988d0009326b6ec,b0f239e443bc0fbb11a27ee98dbaf4e641d21971,b0f239e443bc0fbb11a27ee98dbaf4e641d21971,b0f239e443bc0fbb11a27ee98dbaf4e641d21971,465d822f3f5d5151e7f0dfda5b7134b85d6bf968,b0f239e443bc0fbb11a27ee98dbaf4e641d21971,b0f239e443bc0fbb11a27ee98dbaf4e641d21971,b0f239e443bc0fbb11a27ee98dbaf4e641d21971..eae594cb6ea98d896286565331efce62836fdc8f
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
--- 3/lib/Kconfig.debug
--- 4/lib/Kconfig.debug
--- 5/lib/Kconfig.debug
--- 6/lib/Kconfig.debug
--- 7/lib/Kconfig.debug
--- 8/lib/Kconfig.debug
--- 9/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@@@@@@@@ -252,6 -252,14 -252,6 -252,6 -252,6 -252,6 -252,6 -252,6 -252,6 +252,14 @@@@@@@@@@ config DEBUG_OBJECTS_TIMER
                  timer routines to track the life time of timer objects and
                  validate the timer operations.
         
+ +++++++config DEBUG_OBJECTS_ENABLE_DEFAULT
+ +++++++       int "debug_objects bootup default value (0-1)"
+ +++++++        range 0 1
+ +++++++        default "1"
+ +++++++        depends on DEBUG_OBJECTS
+ +++++++        help
+ +++++++          Debug objects boot parameter default value
+ +++++++
         config DEBUG_SLAB
                bool "Debug slab memory allocations"
                depends on DEBUG_KERNEL && SLAB
@@@@@@@@@@ -544,17 -552,7 -544,7 -544,7 -544,7 -544,7 -544,7 -544,7 -544,7 +552,17 @@@@@@@@@@ config DEBUG_S
                  their sg tables.
         
                  If unsure, say N.
     +   
 ++++++++config DEBUG_NOTIFIERS
 ++++++++       bool "Debug notifier call chains"
 ++++++++       depends on DEBUG_KERNEL
 ++++++++       help
 ++++++++         Enable this to turn on sanity checking for notifier call chains.
 ++++++++         This is most useful for kernel developers to make sure that
 ++++++++         modules properly unregister themselves from notifier chains.
 ++++++++         This is a relatively cheap check but if you care about maximum
 ++++++++         performance, say N.
 ++++ +++
         config FRAME_POINTER
                bool "Compile the kernel with frame pointers"
                depends on DEBUG_KERNEL && \
@@@@@@@@@@ -624,6 -622,6 -614,6 -614,6 -614,6 -614,19 -614,6 -614,6 -614,6 +632,19 @@@@@@@@@@ config RCU_CPU_STALL_DETECTO
                  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 are unsure.
+++++ +++
+++++ +++config RCU_CPU_STALL_DETECTOR
+++++ +++       bool "Check for stalled CPUs delaying RCU grace periods"
+++++ +++       depends on CLASSIC_RCU || TREE_RCU
+++++ +++       default n
+++++ +++       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.