diff --git a/[refs] b/[refs] index be7aab382662..e98dc3e36a59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80c002ddd2e732062e4371314d40515d0b5d8415 +refs/heads/master: 00e10776ff908a767b3d36a53d330db8fdc53a56 diff --git a/trunk/kernel/rcupdate.c b/trunk/kernel/rcupdate.c index a66d4d1615f7..f2c1a04e9b18 100644 --- a/trunk/kernel/rcupdate.c +++ b/trunk/kernel/rcupdate.c @@ -549,7 +549,7 @@ static void rcu_init_percpu_data(int cpu, struct rcu_ctrlblk *rcp, rdp->blimit = blimit; } -static void __devinit rcu_online_cpu(int cpu) +static void __cpuinit rcu_online_cpu(int cpu) { struct rcu_data *rdp = &per_cpu(rcu_data, cpu); struct rcu_data *bh_rdp = &per_cpu(rcu_bh_data, cpu);