Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83478
b: refs/heads/master
c: 844fcc5
h: refs/heads/master
v: v3
  • Loading branch information
Karsten Wiese authored and Linus Torvalds committed Feb 6, 2008
1 parent 496b408 commit d4d7163
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 54d2a37eda3211d3b14c162238e9ccee43e023a9
refs/heads/master: 844fcc53962d781aab7c164acbfa46505427375e
2 changes: 1 addition & 1 deletion trunk/fs/select.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d4d7163

Please sign in to comment.