Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
Pull RCU fixes from Paul McKenney:
"A couple of fixes for RCU regressions:
- A boneheaded boolean-logic bug that resulted in excessive delays on
boot, hibernation and suspend that was reported by Borislav Petkov,
Bjørn Mork, and Joerg Roedel. The fix inserts a single "!".
- A fix for a boot-time splat due to allocating from bootmem too late
in boot, fix courtesy of Sasha Levin with additional help from
Yinghai Lu."
* 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu:
rcu: Don't allocate bootmem from rcu_init()
rcu: Fix comparison sense in rcu_needs_cpu()
+2
-2
+2
-2
kernel/rcutree_plugin.h
+2
-2
kernel/rcutree_plugin.h
···
88
88
#ifdef CONFIG_RCU_NOCB_CPU
89
89
#ifndef CONFIG_RCU_NOCB_CPU_NONE
90
90
if (!have_rcu_nocb_mask) {
91
-
alloc_bootmem_cpumask_var(&rcu_nocb_mask);
91
+
zalloc_cpumask_var(&rcu_nocb_mask, GFP_KERNEL);
92
92
have_rcu_nocb_mask = true;
93
93
}
94
94
#ifdef CONFIG_RCU_NOCB_CPU_ZERO
···
1667
1667
rdtp->last_accelerate = jiffies;
1668
1668
1669
1669
/* Request timer delay depending on laziness, and round. */
1670
-
if (rdtp->all_lazy) {
1670
+
if (!rdtp->all_lazy) {
1671
1671
*dj = round_up(rcu_idle_gp_delay + jiffies,
1672
1672
rcu_idle_gp_delay) - jiffies;
1673
1673
} else {