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

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

diff -u --recursive --new-file v2.1.99/linux/drivers/block/ali14xx.c linux/drivers/block/ali14xx.c
@@ -134,15 +134,15 @@
 
 	/* stuff timing parameters into controller registers */
 	driveNum = (HWIF(drive)->index << 1) + drive->select.b.unit;
-	save_flags(flags);
-	cli();
+	save_flags(flags);	/* all CPUs */
+	cli();			/* all CPUs */
 	outb_p(regOn, basePort);
 	outReg(param1, regTab[driveNum].reg1);
 	outReg(param2, regTab[driveNum].reg2);
 	outReg(param3, regTab[driveNum].reg3);
 	outReg(param4, regTab[driveNum].reg4);
 	outb_p(regOff, basePort);
-	restore_flags(flags);
+	restore_flags(flags);	/* all CPUs */
 }
 
 /*
@@ -154,8 +154,8 @@
 	byte t;
 	unsigned long flags;
 
-	save_flags(flags);
-	cli();
+	__save_flags(flags);	/* local CPU only */
+	__cli();		/* local CPU only */
 	for (i = 0; i < ALI_NUM_PORTS; ++i) {
 		basePort = ports[i];
 		regOff = inb(basePort);
@@ -166,7 +166,7 @@
 				dataPort = basePort + 8;
 				t = inReg(0) & 0xf0;
 				outb_p(regOff, basePort);
-				restore_flags(flags);
+				__restore_flags(flags);	/* local CPU only */
 				if (t != 0x50)
 					return 0;
 				return 1;  /* success */
@@ -174,7 +174,7 @@
 		}
 		outb_p(regOff, basePort);
 	}
-	restore_flags(flags);
+	__restore_flags(flags);	/* local CPU only */
 	return 0;
 }
 
@@ -186,15 +186,15 @@
 	byte t;
 	unsigned long flags;
 
-	save_flags(flags);
-	cli();
+	__save_flags(flags);	/* local CPU only */
+	__cli();		/* local CPU only */
 	outb_p(regOn, basePort);
 	for (p = initData; p->reg != 0; ++p)
 		outReg(p->data, p->reg);
 	outb_p(0x01, regPort);
 	t = inb(regPort) & 0x01;
 	outb_p(regOff, basePort);
-	restore_flags(flags);
+	__restore_flags(flags);	/* local CPU only */
 	return t;
 }