Merge remote-tracking branch 'rcu/rcu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 02:12:37 +0000 (12:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 02:12:37 +0000 (12:12 +1000)
1  2 
include/linux/bug.h
kernel/cpu.c
kernel/rcu/tree.c
kernel/sched/core.c
lib/Kconfig.debug

Simple merge
diff --cc kernel/cpu.c
index e7eca02c757f7ede7743cabb00aa64c787e90e7a,ff8bc3817dde87c3953863d0d61a785e5147f8df..5df20d6d152071b40244fb5d85279b8040a641ba
@@@ -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);
        }
  }
  
Simple merge
Simple merge
Simple merge
This page took 0.037953 seconds and 5 git commands to generate.