diff --git a/[refs] b/[refs] index fd140c8e37cb..81c1882c5eae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54d2a37eda3211d3b14c162238e9ccee43e023a9 +refs/heads/master: 844fcc53962d781aab7c164acbfa46505427375e diff --git a/trunk/fs/select.c b/trunk/fs/select.c index 47f47925aea2..5633fe980781 100644 --- a/trunk/fs/select.c +++ b/trunk/fs/select.c @@ -739,7 +739,7 @@ asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds, timeout_jiffies = -1; else #endif - timeout_jiffies = msecs_to_jiffies(timeout_msecs); + timeout_jiffies = msecs_to_jiffies(timeout_msecs) + 1; } else { /* Infinite (< 0) or no (0) timeout */ timeout_jiffies = timeout_msecs;