diff options
| author | Bryan Cantrill <bryan@joyent.com> | 2014-04-23 07:41:10 +0000 |
|---|---|---|
| committer | Bryan Cantrill <bryan@joyent.com> | 2014-04-23 07:44:59 +0000 |
| commit | 7f98ab2316da18bdec16f363a24fffa33594b4f2 (patch) | |
| tree | 03b60e0981e86e005101b073f9b0a537bada1e31 /usr/src/uts/common/os/streamio.c | |
| parent | e1bd8a8a019df3353d0acd7f92dd710f887ef90b (diff) | |
| download | illumos-joyent-7f98ab2316da18bdec16f363a24fffa33594b4f2.tar.gz | |
OS-2893 add support for epoll
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
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 f9df89923f..4c99f92411 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> @@ -8312,7 +8313,7 @@ chkrd: } *reventsp = (short)retevents; - if (retevents) { + if (retevents && !(events & POLLET)) { if (headlocked) mutex_exit(&stp->sd_lock); return (0); |