From 6fc02b90814d3fe630715e353d16f397a5b280f9 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Thu, 6 Jan 2022 17:41:08 -0800 Subject: [PATCH 4/4] xen: remove ASSERT in rcu_quiet_enter After the recent changes to the RCU subsystem and rcu_quiet_enter, the ASSERT at the beginning of rcu_quiet_enter triggers. It is harmless, so remove it. Signed-off-by: Stefano Stabellini --- xen/common/rcupdate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/common/rcupdate.c b/xen/common/rcupdate.c index cfcc8bbc97..7b9e4bdf15 100644 --- a/xen/common/rcupdate.c +++ b/xen/common/rcupdate.c @@ -732,7 +732,8 @@ void rcu_quiet_enter(void) { unsigned int cpu = smp_processor_id(); - ASSERT(!cpumask_test_cpu(cpu, &rcu_ctrlblk.ignore_cpumask)); + if (cpumask_test_cpu(cpu, &rcu_ctrlblk.ignore_cpumask)) + return; cpumask_set_cpu(cpu, &rcu_ctrlblk.ignore_cpumask); /* * If some other CPU is starting a new grace period, we'll notice that -- 2.25.1