diff options
| author | Bryan Cantrill <bryan@joyent.com> | 2015-02-14 16:55:35 -0800 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2015-10-16 11:59:14 -0700 |
| commit | a5eb7107f06a6e23e8e77e8d3a84c1ff90a73ac6 (patch) | |
| tree | 70fac1fa3fb719f5145ff6db721af2c343faa4f2 /usr/src/uts/common/os/streamio.c | |
| parent | 7509ca605713ac7f244b0e812b1712dd25f04da1 (diff) | |
| download | illumos-joyent-a5eb7107f06a6e23e8e77e8d3a84c1ff90a73ac6.tar.gz | |
5640 want epoll support
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src/uts/common/os/streamio.c')
| -rw-r--r-- | usr/src/uts/common/os/streamio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/uts/common/os/streamio.c b/usr/src/uts/common/os/streamio.c index c6ebe8b110..18a5ded1c6 100644 --- a/usr/src/uts/common/os/streamio.c +++ b/usr/src/uts/common/os/streamio.c @@ -24,6 +24,7 @@ /* * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, Joyent, Inc. All rights reserved. */ #include <sys/types.h> @@ -8311,7 +8312,7 @@ chkrd: } *reventsp = (short)retevents; - if (retevents) { + if (retevents && !(events & POLLET)) { if (headlocked) mutex_exit(&stp->sd_lock); return (0); |