Re: megaraid2.c PATCH (was: Linux 2.4.28-rc3)

["Andrey J. Melnikoff (TEMHOTA)" <temnota@kmv.ru>]

Hi Marcelo Tosatti!
 On Sat, Nov 13, 2004 at 01:24:50PM -0200, Marcelo Tosatti wrote next:

> On Sat, Nov 13, 2004 at 07:27:09PM +0300, Andrey Melnikoff wrote:
> > In article <20041112180052.GE23215@logos.cnet> you wrote:
> > > Hi,
> > 
> > > Here goes the third release candidate.
> > 
> > > It contains a v2.6 backport of the binfmt_elf potential vulnerabilities
> > > disclosed this week, an enhanced smbfs client overflow fix, an ACPI update
> > > fixing a couple of nasty bugs, a NFS client bugfix and a network update
> > > from Davem.
> > 
> > Any chance to apply this patch before release?
> > 
> > Prevent NMI oopser kill kernel thread when megearid2 driver wating abort or
> > reset command completion. 
> 
> I talked to Atul and Arjan about this one - the correct thing to do is to 
> replace mdelay() with CPU yielding msleep(). 
> 
> We should backport msleep() in 2.4.29-pre1. 

Ok, msleep() backported, but driver isn't fixed. This patch acceptable?

Prevent NMI oopser kill kernel thread when megearid2 driver wating 
abort or reset command completion. 

Signed-off-by: Andrey Melnikov <temnota+kernel@kmv.ru>

--- linux-2.4.29/drivers/scsi/megaraid2.c~	Wed Jan 19 20:39:04 2005
+++ linux-2.4.29/drivers/scsi/megaraid2.c	Wed Jan 19 20:44:21 2005
@@ -2819,7 +2819,7 @@
 		}
 
 		if( iter++ < MBOX_ABORT_SLEEP*1000 ) {
-			mdelay(1);
+			msleep(1);
 		}
 		else {
 			printk(KERN_WARNING
@@ -2899,7 +2899,7 @@
 		}
 
 		if( iter++ < MBOX_RESET_SLEEP*1000 ) {
-			mdelay(1);
+			msleep(1);
 		}
 		else {
 			printk(KERN_WARNING
@@ -4040,10 +4040,10 @@
 	printk(KERN_INFO "megaraid: cache flush delay:   ");
 	for( i = 9; i >= 0; i-- ) {
 		printk("\b\b\b[%d]", i);
-		mdelay(1000);
+		msleep(1000);
 	}
 	printk("\b\b\b[done]\n");
-	mdelay(1000);
+	msleep(1000);
 
 	return NOTIFY_DONE;
 }

-- 
 Best regards, TEMHOTA-RIPN aka MJA13-RIPE
 System Administrator. mailto:temnota@kmv.ru