From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nishanth Aravamudan Subject: Re: [patch 05/18] net/s2io: replace schedule_timeout() with msleep() Date: Mon, 1 Nov 2004 10:31:18 -0800 Message-ID: <20041101183118.GA1730@us.ibm.com> References: <4184C7EE.5070107@pobox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: janitor@sternwelten.at, netdev@oss.sgi.com Return-path: To: Jeff Garzik Content-Disposition: inline In-Reply-To: <4184C7EE.5070107@pobox.com> Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com List-Id: netdev.vger.kernel.org On Sun, Oct 31, 2004 at 06:09:34AM -0500, Jeff Garzik wrote: > janitor@sternwelten.at wrote: > >@@ -2846,11 +2838,10 @@ static int s2io_ethtool_idnic(struct net > > sp->id_timer.data = (unsigned long) sp; > > } > > mod_timer(&sp->id_timer, jiffies); > >- set_current_state(TASK_INTERRUPTIBLE); > > if (data) > >- schedule_timeout(data * HZ); > >+ msleep_interruptible(data * 1000); > > > clearly wants ssleep() here Even though ssleep() is in TASK_UNINTERRUPTIBLE? In cases where the existing code used TASK_INTERRUPTIBLE, but was sleeping in terms of seconds, I left it as msleep_interruptible, since ssleep_interruptible() doesn't exist. -Nish