Commit 844fcc53 authored by Karsten Wiese's avatar Karsten Wiese Committed by Linus Torvalds

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: default avatarKarsten 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 54d2a37e
...@@ -739,7 +739,7 @@ asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds, ...@@ -739,7 +739,7 @@ asmlinkage long sys_poll(struct pollfd __user *ufds, unsigned int nfds,
timeout_jiffies = -1; timeout_jiffies = -1;
else else
#endif #endif
timeout_jiffies = msecs_to_jiffies(timeout_msecs); timeout_jiffies = msecs_to_jiffies(timeout_msecs) + 1;
} else { } else {
/* Infinite (< 0) or no (0) timeout */ /* Infinite (< 0) or no (0) timeout */
timeout_jiffies = timeout_msecs; timeout_jiffies = timeout_msecs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment