diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 08:04:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 08:04:08 +0100 |
| commit | d2e971d884e7b7e65162788b8f3b7801cd8bc137 (patch) | |
| tree | 5f95f2e0e98d4181c50301e6dfa39cc87aa1c17a /fs/eventpoll.c | |
| parent | Merge tag 'phy-for-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kish... (diff) | |
| parent | Linux 5.6-rc7 (diff) | |
| download | linux-d2e971d884e7b7e65162788b8f3b7801cd8bc137.tar.xz linux-d2e971d884e7b7e65162788b8f3b7801cd8bc137.zip | |
Merge 5.6-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/eventpoll.c')
| -rw-r--r-- | fs/eventpoll.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index b041b66002db..eee3c92a9ebf 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -1854,9 +1854,9 @@ fetch_events: waiter = true; init_waitqueue_entry(&wait, current); - spin_lock_irq(&ep->wq.lock); + write_lock_irq(&ep->lock); __add_wait_queue_exclusive(&ep->wq, &wait); - spin_unlock_irq(&ep->wq.lock); + write_unlock_irq(&ep->lock); } for (;;) { @@ -1904,9 +1904,9 @@ send_events: goto fetch_events; if (waiter) { - spin_lock_irq(&ep->wq.lock); + write_lock_irq(&ep->lock); __remove_wait_queue(&ep->wq, &wait); - spin_unlock_irq(&ep->wq.lock); + write_unlock_irq(&ep->lock); } return res; |