diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-10-12 19:03:58 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-10-12 19:03:58 +0300 |
| commit | d9f673051ab54dd5263fef6da97ef08feedaa754 (patch) | |
| tree | 6d7e19bd3345bd43e3488d17f6cb60ff16289b3d /net/unix/af_unix.c | |
| parent | 814c8757115f9d7135126ac43d3a178b31e796dd (diff) | |
| parent | 1176d15f0f6e556d54ced510ac4a91694960332b (diff) | |
| download | linux-d9f673051ab54dd5263fef6da97ef08feedaa754.tar.xz | |
Merge drm/drm-next into drm-intel-next
Need to resync drm-intel-next with TTM and PXP stuff from
drm-intel-gt-next that is now in drm/drm-next.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index eb47b9de2380..92345c9bb60c 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -3073,7 +3073,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock, other = unix_peer(sk); if (other && unix_peer(other) != sk && - unix_recvq_full(other) && + unix_recvq_full_lockless(other) && unix_dgram_peer_wake_me(sk, other)) writable = 0; |