patch-2.1.100 linux/drivers/block/pdc4030.c

• Lines: 26
• Date: Wed May 6 14:42:54 1998
• Orig file: v2.1.99/linux/drivers/block/pdc4030.c
• Orig date: Wed Dec 17 11:11:16 1997

diff -u --recursive --new-file v2.1.99/linux/drivers/block/pdc4030.c linux/drivers/block/pdc4030.c
@@ -327,15 +327,9 @@
 	    do {
 		stat=GET_STAT();
 		if(stat & DRQ_STAT) {
-/*                    unsigned long flags;
-                    save_flags(flags);
-                    cli();
                     disable_irq(HWIF(drive)->irq);
-*/
 		    ide_intr(HWIF(drive)->irq,HWGROUP(drive),NULL);
-/*                    enable_irq(HWIF(drive)->irq);
-                    restore_flags(flags);
-*/
+                    enable_irq(HWIF(drive)->irq);
 		    return;
 		}
 		if(IN_BYTE(IDE_SELECT_REG) & 0x01)
@@ -353,7 +347,7 @@
 		return;
 	    }
 	    if (!drive->unmask)
-		cli();
+		__cli();	/* local CPU only */
 	    HWGROUP(drive)->wrq = *rq; /* scratchpad */
 	    promise_write(drive);
 	    return;