From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Tue, 26 Mar 2013 15:07:38 +0000 (-0700)
Subject: Merge branches 'doc.2013.03.12a', 'fixes.2013.03.13a' and 'idlenocb.2013.03.26b'... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d87669357936bffa1e8fea7a4e7743e76905736;p=linux-beck.git

Merge branches 'doc.2013.03.12a', 'fixes.2013.03.13a' and 'idlenocb.2013.03.26b' into HEAD

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.
---

6d87669357936bffa1e8fea7a4e7743e76905736
diff --cc kernel/rcutree.c
index 5b8ad827fd86,0e522504ae37,9cb91e4885af..2d5f94c1c7fb
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@@@ -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