Merge branch 'core/percpu' into x86/paravirt

[karo-tx-linux.git] / kernel / rcuclassic.c

diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c
index 0ff9b05706a6c06451ff24590c70a5936b1b21e6..bd5a9003497c200d7ef7a44ec252b2d96b2ac562 100644 (file)
--- a/kernel/rcuclassic.c
+++ b/kernel/rcuclassic.c
@@ -395,7 +395,7 @@ static void rcu_start_batch(struct rcu_ctrlblk *rcp)
                 */
                smp_mb();
                cpumask_andnot(to_cpumask(rcp->cpumask),
-                              cpu_online_mask, &nohz_cpu_mask);
+                              cpu_online_mask, nohz_cpu_mask);
 
                rcp->signaled = 0;
        }
@@ -716,7 +716,7 @@ void rcu_check_callbacks(int cpu, int user)
        raise_rcu_softirq();
 }
 
-static void rcu_init_percpu_data(int cpu, struct rcu_ctrlblk *rcp,
+static void __cpuinit rcu_init_percpu_data(int cpu, struct rcu_ctrlblk *rcp,
                                                struct rcu_data *rdp)
 {
        unsigned long flags;