patch-2.1.81 linux/drivers/block/floppy.c

• Lines: 14
• Date: Fri Jan 23 11:07:07 1998
• Orig file: v2.1.80/linux/drivers/block/floppy.c
• Orig date: Mon Jan 12 14:57:50 1998

diff -u --recursive --new-file v2.1.80/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -1710,10 +1710,11 @@
 		} while ((ST0 & 0x83) != UNIT(current_drive) && inr == 2);
 	}
 	if (handler) {
-		if(softirq_trylock()) {
+		int cpu = smp_processor_id();
+		if(softirq_trylock(cpu)) {
 			/* got the lock, call the handler immediately */
 			handler();
-			softirq_endlock();
+			softirq_endlock(cpu);
 		} else
 			/* we interrupted a bottom half. Defer handler */
 			schedule_bh( (void *)(void *) handler);