diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-01-20 11:08:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-01-20 11:42:57 +1000 |
| commit | 3d4743131b8de970faa4b979ead0fadfe5d2de9d (patch) | |
| tree | 68e948c2d94d48598dd37e31bb654feb0b43ae4a /kernel/locking/rwsem.c | |
| parent | df95968ff78931576ac7a3d3b30312894aaaf22e (diff) | |
| parent | def9d2780727cec3313ed3522d0123158d87224d (diff) | |
Backmerge v5.5-rc7 into drm-next
msm needs 5.5-rc4, go to the latest.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'kernel/locking/rwsem.c')
| -rw-r--r-- | kernel/locking/rwsem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c index 44e68761f432..0d9b6be9ecc8 100644 --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -1226,8 +1226,8 @@ wait: * In this case, we attempt to acquire the lock again * without sleeping. */ - if ((wstate == WRITER_HANDOFF) && - (rwsem_spin_on_owner(sem, 0) == OWNER_NULL)) + if (wstate == WRITER_HANDOFF && + rwsem_spin_on_owner(sem, RWSEM_NONSPINNABLE) == OWNER_NULL) goto trylock_again; /* Block until there are no active lockers. */ |