Merge branches 'doc.2013.03.12a', 'fixes.2013.03.13a' and 'idlenocb.2013.03.26b'...
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 26 Mar 2013 15:07:38 +0000 (08:07 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 26 Mar 2013 15:07:38 +0000 (08:07 -0700)
doc.2013.03.12a: Documentation changes.

fixes.2013.03.13a: Miscellaneous fixes.

idlenocb.2013.03.26b: Remove restrictions on no-CBs CPUs, make
RCU_FAST_NO_HZ take advantage of numbered callbacks, add
callback acceleration based on numbered callbacks.

1  2  3 
kernel/rcutree.c
kernel/rcutree.h
kernel/rcutree_plugin.h

index 5b8ad827fd86e74932a0b42b40c8f5c27e370228,0e522504ae37c710c006d424a6933fc3ae5509c8,9cb91e4885afe8fae80ef83a0c49d43e187da8fd..2d5f94c1c7fb01783bb49cbde52ad98c8b74386e
@@@@ -2930,14 -2932,9 -3068,13 +3070,8 @@@@ static int __cpuinit rcu_cpu_notify(str
                break;
        case CPU_DYING:
        case CPU_DYING_FROZEN:
- -             /*
- -              * The whole machine is "stopped" except this CPU, so we can
- -              * touch any data without introducing corruption. We send the
- -              * dying CPU's callbacks to an arbitrarily chosen online CPU.
- -              */
                for_each_rcu_flavor(rsp)
                        rcu_cleanup_dying_cpu(rsp);
--              rcu_cleanup_after_idle(cpu);
                break;
        case CPU_DEAD:
        case CPU_DEAD_FROZEN:
@@@@ -3170,8 -3167,8 -3308,7 +3305,7 @@@@ void __init rcu_init(void
        rcu_init_one(&rcu_sched_state, &rcu_sched_data);
        rcu_init_one(&rcu_bh_state, &rcu_bh_data);
        __rcu_init_preempt();
--      rcu_init_nocb();
- -      open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);
+ +     open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);
   
        /*
         * We don't need protection against CPU-hotplug here because
Simple merge
Simple merge