diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-07-30 13:56:09 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2025-07-30 13:56:09 -0400 |
| commit | 196d9e72c4b0bd68b74a4ec7f52d248f37d0f030 (patch) | |
| tree | 51293a46fba8b9b7283781ada645b8a2ae4c3f68 /kernel/entry/common.c | |
| parent | 6836e1f30fe90e4c19f6a3749e97ba1e44a840ef (diff) | |
| parent | 57d88f02eb4449d96dfee3af4b7cd4287998bdbd (diff) | |
Merge tag 'kvm-s390-next-6.17-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
RCU wakeup fix for KVM s390 guest entry
Diffstat (limited to 'kernel/entry/common.c')
| -rw-r--r-- | kernel/entry/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c index a8dd1f27417c..eb52d38e8099 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -220,7 +220,8 @@ noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs) * TINY_RCU does not support EQS, so let the compiler eliminate * this part when enabled. */ - if (!IS_ENABLED(CONFIG_TINY_RCU) && is_idle_task(current)) { + if (!IS_ENABLED(CONFIG_TINY_RCU) && + (is_idle_task(current) || arch_in_rcu_eqs())) { /* * If RCU is not watching then the same careful * sequence vs. lockdep and tracing is required |