Commit 844fcc53 authored Feb 06, 2008 by Karsten Wiese Committed by Linus Torvalds Feb 06, 2008

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>

parent 54d2a37e

fs/select.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message