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

• Lines: 27
• Date: Mon Aug 9 12:04:38 1999
• Orig file: v2.2.10/linux/arch/i386/kernel/irq.c
• Orig date: Mon May 10 10:32:45 1999

diff -u --recursive --new-file v2.2.10/linux/arch/i386/kernel/irq.c linux/arch/i386/kernel/irq.c
@@ -139,7 +139,7 @@
 /*
  * Controller mappings for all interrupt sources:
  */
-irq_desc_t irq_desc[NR_IRQS] = { [0 ... NR_IRQS-1] = { 0, &no_irq_type, }};
+irq_desc_t irq_desc[NR_IRQS] __cacheline_aligned = { [0 ... NR_IRQS-1] = { 0, &no_irq_type, }};
 
 
 /*
@@ -927,6 +927,17 @@
 		return;
 
 	spin_lock_irqsave(&irq_controller_lock,flags);
+
+#ifdef __SMP__
+        /* Make sure no interrupt handler is in progress when we
+           manipulate the action list and free the structure */
+        while (irq_desc[irq].status & IRQ_INPROGRESS) {
+                spin_unlock_irqrestore(&irq_controller_lock,flags);
+                udelay(1000);
+                spin_lock_irqsave(&irq_controller_lock,flags);
+        }
+#endif
+
 	for (p = &irq_desc[irq].action; (action = *p) != NULL; p = &action->next) {
 		if (action->dev_id != dev_id)
 			continue;