Messages in this thread | | | From | "Miller, Mike (OS Dev)" <> | Date | Mon, 31 Aug 2009 14:23:30 +0000 | Subject | RE: [PATCH] cciss: fix schedule_timeout() parameters |
| |
> -----Original Message----- > From: Randy Dunlap [mailto:rdunlap@xenotime.net] > Sent: Sunday, August 30, 2009 3:19 PM > To: lkml > Cc: akpm; Miller, Mike (OS Dev); ISS StorageDev > Subject: [PATCH] cciss: fix schedule_timeout() parameters > > From: Randy Dunlap <randy.dunlap@oracle.com> > > Change schedule_timeout() parameter to not be specific to HZ=1000. > > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> > Cc: Mike Miller <mike.miller@hp.com> > Cc: iss_storagedev@hp.com
Acked-by: Mike Miller <mike.miller@hp.com>
> --- > drivers/block/cciss.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > --- lnx-2631-rc7.orig/drivers/block/cciss.c > +++ lnx-2631-rc7/drivers/block/cciss.c > @@ -36,6 +36,7 @@ > #include <linux/proc_fs.h> > #include <linux/seq_file.h> > #include <linux/init.h> > +#include <linux/jiffies.h> > #include <linux/hdreg.h> > #include <linux/spinlock.h> > #include <linux/compat.h> > @@ -3489,7 +3490,7 @@ static int __devinit cciss_pci_init(ctlr > if (scratchpad == CCISS_FIRMWARE_READY) > break; > set_current_state(TASK_INTERRUPTIBLE); > - schedule_timeout(HZ / 10); /* wait 100ms */ > + schedule_timeout(msecs_to_jiffies(100)); > /* wait 100ms */ > } > if (scratchpad != CCISS_FIRMWARE_READY) { > printk(KERN_WARNING "cciss: Board not ready. > Timed out.\n"); @@ -3615,7 +3616,7 @@ static int __devinit > cciss_pci_init(ctlr > break; > /* delay and try again */ > set_current_state(TASK_INTERRUPTIBLE); > - schedule_timeout(10); > + schedule_timeout(msecs_to_jiffies(1)); > } > > #ifdef CCISS_DEBUG >
| |