From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 02:12:37 +0000 (+1000)
Subject: Merge remote-tracking branch 'rcu/rcu/next'
X-Git-Url: http://git.efficios.com/?p=deliverable%2Flinux.git;a=commitdiff_plain;h=72b5d28ed8ab410cd029fc6e7536b904c0b9f4a0

Merge remote-tracking branch 'rcu/rcu/next'
---

72b5d28ed8ab410cd029fc6e7536b904c0b9f4a0
diff --cc kernel/cpu.c
index e7eca02c757f,ff8bc3817dde..5df20d6d1520
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@@ -966,9 -889,13 +966,10 @@@ void notify_cpu_starting(unsigned int c
  	struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
  	enum cpuhp_state target = min((int)st->target, CPUHP_AP_ONLINE);
  
+ 	rcu_cpu_starting(cpu);	/* Enables RCU usage on this CPU. */
  	while (st->state < target) {
 -		struct cpuhp_step *step;
 -
  		st->state++;
 -		step = cpuhp_ap_states + st->state;
 -		cpuhp_invoke_callback(cpu, st->state, step->startup);
 +		cpuhp_invoke_callback(cpu, st->state, true, NULL);
  	}
  }