Re: 2.6.9-rc2-kjt1 rio_linux compile error

[Nishanth Aravamudan <nacc@us.ibm.com>]

On Wed, Sep 22, 2004 at 01:21:58PM +0200, Adrian Bunk wrote:
> On Wed, Sep 22, 2004 at 12:13:07AM +0200, maximilian attems wrote:
> >...
> > added since 2.6.9-rc1-kjt1
> >...
> > msleep-drivers_char_rio_linux.patch
> >   From: Nishanth Aravamudan <nacc@us.ibm.com>
> >   Subject: [Kernel-janitors] [PATCH 2.6.9-rc2 20/33] char/rio_linux: replace 	schedule_timeout() with msleep()/msleep_interruptible()
> >...
> 
> This doesn't compile (obvious typo):

Thanks for catching this! Here is the fixed patch:


--- 2.6.9-rc2-vanilla/drivers/char/rio/rio_linux.c	2004-09-13 17:15:47.000000000 -0700
+++ 2.6.9-rc2/drivers/char/rio/rio_linux.c	2004-09-22 09:20:56.000000000 -0700
@@ -330,8 +330,7 @@ int RIODelay (struct Port *PortP, int nj
   func_enter ();
 
   rio_dprintk (RIO_DEBUG_DELAY, "delaying %d jiffies\n", njiffies);  
-  current->state = TASK_INTERRUPTIBLE;
-  schedule_timeout(njiffies);
+  msleep_interruptible(jiffies_to_msecs(njiffies));
   func_exit();
 
   if (signal_pending(current))
@@ -347,8 +346,7 @@ int RIODelay_ni (struct Port *PortP, int
   func_enter ();
 
   rio_dprintk (RIO_DEBUG_DELAY, "delaying %d jiffies (ni)\n", njiffies);  
-  current->state = TASK_UNINTERRUPTIBLE;
-  schedule_timeout(njiffies);
+  msleep(jiffies_to_msecs(njiffies));
   func_exit();
   return !RIO_FAIL;
 }