diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2012-05-15 03:21:26 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-05-15 03:21:26 -0400 |
| commit | b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5 (patch) | |
| tree | 518ec8f4bfd316e91bcc30f434edb78529557eba /net/unix/af_unix.c | |
| parent | 8a63b1994c500d4825ee73dc71502deffe5b135b (diff) | |
| parent | 4bb2d1009f671815870e8f78e826e4f9071392a7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to add prerequisite for ARM ux500 crypto support.
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 eb4277c33188..d510353ef431 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -2206,7 +2206,7 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock, | |||
| 2206 | } | 2206 | } |
| 2207 | 2207 | ||
| 2208 | /* No write status requested, avoid expensive OUT tests. */ | 2208 | /* No write status requested, avoid expensive OUT tests. */ |
| 2209 | if (wait && !(wait->key & (POLLWRBAND | POLLWRNORM | POLLOUT))) | 2209 | if (!(poll_requested_events(wait) & (POLLWRBAND|POLLWRNORM|POLLOUT))) |
| 2210 | return mask; | 2210 | return mask; |
| 2211 | 2211 | ||
| 2212 | writable = unix_writable(sk); | 2212 | writable = unix_writable(sk); |