From a5eb7107f06a6e23e8e77e8d3a84c1ff90a73ac6 Mon Sep 17 00:00:00 2001
From: Bryan Cantrill <bryan@joyent.com>
Date: Sat, 14 Feb 2015 16:55:35 -0800
Subject: 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>

---
 usr/src/uts/common/os/streamio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr/src/uts/common/os/streamio.c')

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);
-- 
cgit v1.2.3