diff options
| author | Tom Zanussi <zanussi@kernel.org> | 2019-11-21 17:12:05 -0600 |
|---|---|---|
| committer | Tom Zanussi <zanussi@kernel.org> | 2019-11-21 17:12:05 -0600 |
| commit | 5768e654ca95af534560e33d2f2a8408c99a74e8 (patch) | |
| tree | e7d4b344e9eb5af231595d34c1d3309e647c83b0 /kernel/locking | |
| parent | 697da24cd821f46d1ad393ff39779701f78b4328 (diff) | |
| parent | e132c8d7b58d8dc2c1888f5768454550d1f3ea7b (diff) | |
| download | linux-rt-5768e654ca95af534560e33d2f2a8408c99a74e8.tar.gz | |
Merge tag 'v4.14.149' into v4.14-rt-work
This is the 4.14.149 stable release
Diffstat (limited to 'kernel/locking')
| -rw-r--r-- | kernel/locking/qspinlock_paravirt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h index 1e882dfc8b79..3a6aeae98a4a 100644 --- a/kernel/locking/qspinlock_paravirt.h +++ b/kernel/locking/qspinlock_paravirt.h @@ -247,7 +247,7 @@ pv_wait_early(struct pv_node *prev, int loop) if ((loop & PV_PREV_CHECK_MASK) != 0) return false; - return READ_ONCE(prev->state) != vcpu_running || vcpu_is_preempted(prev->cpu); + return READ_ONCE(prev->state) != vcpu_running; } /* |