projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[deliverable/linux.git]
/
fs
/
select.c
diff --git
a/fs/select.c
b/fs/select.c
index 47f47925aea2bead2a4491d672476a7a63e9be1b..5633fe98078179b472a878c444594c4628dbde28 100644
(file)
--- a/
fs/select.c
+++ b/
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;
This page took
0.054584 seconds
and
5
git commands to generate.