|
|
@@ -88,7 +88,7 @@ static void __init rcu_bootup_announce_oddness(void)
|
|
|
#ifdef CONFIG_RCU_NOCB_CPU
|
|
|
#ifndef CONFIG_RCU_NOCB_CPU_NONE
|
|
|
if (!have_rcu_nocb_mask) {
|
|
|
- alloc_bootmem_cpumask_var(&rcu_nocb_mask);
|
|
|
+ zalloc_cpumask_var(&rcu_nocb_mask, GFP_KERNEL);
|
|
|
have_rcu_nocb_mask = true;
|
|
|
}
|
|
|
#ifdef CONFIG_RCU_NOCB_CPU_ZERO
|
|
|
@@ -1667,7 +1667,7 @@ int rcu_needs_cpu(int cpu, unsigned long *dj)
|
|
|
rdtp->last_accelerate = jiffies;
|
|
|
|
|
|
/* Request timer delay depending on laziness, and round. */
|
|
|
- if (rdtp->all_lazy) {
|
|
|
+ if (!rdtp->all_lazy) {
|
|
|
*dj = round_up(rcu_idle_gp_delay + jiffies,
|
|
|
rcu_idle_gp_delay) - jiffies;
|
|
|
} else {
|