diff options
author | Ingo Molnar <mingo@kernel.org> | 2021-08-17 17:16:29 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2021-08-17 17:16:29 +0300 |
commit | c87866ede44ad7da6b296d732221dc34ce1b154d (patch) | |
tree | 2df013f6824e9252a1b30b1ea7f1681e454c6218 /kernel/locking/rwsem.c | |
parent | 55bccf1f93e4bf1b3209cc8648ab53f10f4601a5 (diff) | |
parent | 7c60610d476766e128cc4284bb6349732cbd6606 (diff) | |
download | linux-c87866ede44ad7da6b296d732221dc34ce1b154d.tar.xz |
Merge tag 'v5.14-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking/rwsem.c')
-rw-r--r-- | kernel/locking/rwsem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c index 2cad15df296f..8a595b60ca9b 100644 --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -889,7 +889,7 @@ rwsem_spin_on_owner(struct rw_semaphore *sem) * Wait for the read lock to be granted */ static struct rw_semaphore __sched * -rwsem_down_read_slowpath(struct rw_semaphore *sem, long count, int state) +rwsem_down_read_slowpath(struct rw_semaphore *sem, long count, unsigned int state) { long adjustment = -RWSEM_READER_BIAS; long rcnt = (count >> RWSEM_READER_SHIFT); |