patch-2.1.83 linux/arch/i386/kernel/irq.c

• Lines: 45
• Date: Fri Jan 30 11:16:03 1998
• Orig file: v2.1.82/linux/arch/i386/kernel/irq.c
• Orig date: Fri Jan 30 11:28:06 1998

diff -u --recursive --new-file v2.1.82/linux/arch/i386/kernel/irq.c linux/arch/i386/kernel/irq.c
@@ -421,7 +421,19 @@
 {
 	int count = MAXCOUNT;
 
-	while (atomic_read(&global_irq_count)) {
+	for (;;) {
+
+		/*
+		 * Wait until all interrupts are gone. Wait
+		 * for bottom half handlers unless we're
+		 * already executing in one..
+		 */
+		if (!atomic_read(&global_irq_count)) {
+			if (local_bh_count[cpu] || !atomic_read(&global_bh_count))
+				break;
+		}
+
+		/* Duh, we have to loop. Release the lock to avoid deadlocks */
 		clear_bit(0,&global_irq_lock);
 
 		for (;;) {
@@ -437,6 +449,8 @@
 				continue;
 			if (global_irq_lock)
 				continue;
+			if (!local_bh_count[cpu] && atomic_read(&global_bh_count))
+				continue;
 			if (!test_and_set_bit(0,&global_irq_lock))
 				break;
 		}
@@ -470,9 +484,11 @@
  */
 void synchronize_irq(void)
 {
-	/* Stupid approach */
-	cli();
-	sti();
+	if (atomic_read(&global_irq_count)) {
+		/* Stupid approach */
+		cli();
+		sti();
+	}
 }
 
 static inline void get_irqlock(int cpu)