Merge r8049 (#158425: sys_poll incorrectly emulated when RES==0)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8086

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index ccea5c5fb0497aa2e62f6f472047b31ebf8ba3ba..4879869874b0fc016ee1756010ebc910f7dae9c5 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -5258,7 +5258,7 @@ PRE(sys_poll)
 
 POST(sys_poll)
 {
-   if (RES > 0) {
+   if (RES >= 0) {
       UInt i;
       struct vki_pollfd* ufds = (struct vki_pollfd *)ARG1;
       for (i = 0; i < ARG2; i++)