summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorKarsten Wiese <fzu@wemgehoertderstaat.de>2008-02-06 01:37:59 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 10:41:09 -0800
commit844fcc53962d781aab7c164acbfa46505427375e (patch)
tree2d0108617ebff6eec82c7c21f5bdf3a7610d4525 /fs
parent54d2a37eda3211d3b14c162238e9ccee43e023a9 (diff)
downloadop-kernel-dev-844fcc53962d781aab7c164acbfa46505427375e.zip
op-kernel-dev-844fcc53962d781aab7c164acbfa46505427375e.tar.gz
make sys_poll() wait at least timeout ms
schedule_timeout(jiffies) waits for at least jiffies - 1. Add 1 jiffie to the timeout_jiffies calculated in sys_poll() to wait at least timeout_msecs, like poll() manpage says. Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/select.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/select.c b/fs/select.c
index 47f4792..5633fe9 100644
--- 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;
OpenPOWER on IntegriCloud