Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932229Ab3ENOsz (ORCPT ); Tue, 14 May 2013 10:48:55 -0400 Received: from mga09.intel.com ([134.134.136.24]:52878 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932136Ab3ENOsy (ORCPT ); Tue, 14 May 2013 10:48:54 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,671,1363158000"; d="scan'208";a="313414969" From: Imre Deak To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Daniel Vetter , Thomas Gleixner Subject: [PATCH v2 2/8] sched: msleep: take msecs_to_jiffies_timeout into use Date: Tue, 14 May 2013 17:48:32 +0300 Message-Id: <1368542918-8861-3-git-send-email-imre.deak@intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368542918-8861-1-git-send-email-imre.deak@intel.com> References: <1368542918-8861-1-git-send-email-imre.deak@intel.com> In-Reply-To: <1368188011-23661-1-git-send-email-imre.deak@intel.com> References: <1368188011-23661-1-git-send-email-imre.deak@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1176 Lines: 37 Use msecs_to_jiffies_timeout instead of open-coding the same. Signed-off-by: Imre Deak --- kernel/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/timer.c b/kernel/timer.c index a860bba..f397d3b 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1660,7 +1660,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_timeout(msecs); while (timeout) timeout = schedule_timeout_uninterruptible(timeout); @@ -1674,7 +1674,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_timeout(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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/