1 files changed, 11 insertions, 4 deletions

diff --git a/fs/select.c b/fs/select.c
index d870237e42c7..a201fc370223 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -41,22 +41,28 @@
  * better solutions..
  */
 
+#define MAX_SLACK       (100 * NSEC_PER_MSEC)
+
 static long __estimate_accuracy(struct timespec *tv)
 {
         long slack;
         int divfactor = 1000;
 
+        if (tv->tv_sec < 0)
+                return 0;
+
         if (task_nice(current) > 0)
                 divfactor = divfactor / 5;
 
+        if (tv->tv_sec > MAX_SLACK / (NSEC_PER_SEC/divfactor))
+                return MAX_SLACK;
+
         slack = tv->tv_nsec / divfactor;
         slack += tv->tv_sec * (NSEC_PER_SEC/divfactor);
 
-        if (slack > 100 * NSEC_PER_MSEC)
-                slack =  100 * NSEC_PER_MSEC;
+        if (slack > MAX_SLACK)
+                return MAX_SLACK;
 
-        if (slack < 0)
-                slack = 0;
         return slack;
 }
 
@@ -110,6 +116,7 @@ void poll_initwait(struct poll_wqueues *pwq)
 {
         init_poll_funcptr(&pwq->pt, __pollwait);
         pwq->polling_task = current;
+        pwq->triggered = 0;
         pwq->error = 0;
         pwq->table = NULL;
         pwq->inline_index = 0;