Use msecs_to_jiffies_min instead of open-coding the same. Signed-off-by: Imre Deak <imre.d...@intel.com> --- kernel/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/timer.c b/kernel/timer.c index dbf7a78..dcdc8bd 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1799,7 +1799,7 @@ void __init init_timers(void) */ void msleep(unsigned int msecs) { - unsigned long timeout = msecs_to_jiffies(msecs) + 1; + unsigned long timeout = msecs_to_jiffies_min(msecs); while (timeout) timeout = schedule_timeout_uninterruptible(timeout); @@ -1813,7 +1813,7 @@ EXPORT_SYMBOL(msleep); */ unsigned long msleep_interruptible(unsigned int msecs) { - unsigned long timeout = msecs_to_jiffies(msecs) + 1; + unsigned long timeout = msecs_to_jiffies_min(msecs); while (timeout && !signal_pending(current)) timeout = schedule_timeout_interruptible(timeout); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/