aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds2020-01-29 11:04:49 -0800
committerLinus Torvalds2020-01-29 11:04:49 -0800
commit15d6632496537fa66488221ee5dd2f9fb318ef2e (patch)
treebe4289b6e0cd9757f08a468965a2aa0376f4949e
parent80b60e3849bfe987801a73ebd4bab43b7b591a09 (diff)
parent59d8cc6b2e375ff486b030da6703b1d481e186e6 (diff)
Merge branch 'urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
Pull RCU warning removal from Paul McKenney: "A single commit that fixes an embarrassing bug discussed here: https://lore.kernel.org/lkml/20200125131425.GB16136@zn.tnic/ which apparently also affects smaller systems" [ This was sent to Ingo, but since I see the issue on the laptop I use for testing during the merge window, I'm doing the pull directly - Linus ] * 'urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu: rcu: Forgive slow expedited grace periods at boot time
-rw-r--r--kernel/rcu/tree_exp.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h
index 6935a9e2b094..dcbd75791f39 100644
--- a/kernel/rcu/tree_exp.h
+++ b/kernel/rcu/tree_exp.h
@@ -508,7 +508,6 @@ static void synchronize_rcu_expedited_wait(void)
tick_dep_set_cpu(cpu, TICK_DEP_BIT_RCU_EXP);
}
}
- WARN_ON_ONCE(1);
}
for (;;) {