patch-2.1.89 linux/arch/i386/kernel/irq.h

Next file: linux/arch/i386/kernel/ldt.c
Previous file: linux/arch/i386/kernel/irq.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.88/linux/arch/i386/kernel/irq.h linux/arch/i386/kernel/irq.h
@@ -20,13 +20,7 @@
 int IO_APIC_get_PCI_irq_vector (int bus, int slot, int fn);
 void make_8259A_irq (unsigned int irq);
 
-#ifdef __SMP__
- extern unsigned int io_apic_irqs;
-#else
- extern const unsigned int io_apic_irqs;
-#endif
-
-#define IO_APIC_IRQ(x) ((1<<x) & io_apic_irqs)
+extern unsigned int io_apic_irqs;
 
 #define MAX_IRQ_SOURCES 128
 #define MAX_MP_BUSSES 32
@@ -62,10 +56,18 @@
 	release_irqlock(cpu);
 }
 
+#define IO_APIC_IRQ(x) ((1<<x) & io_apic_irqs)
+
 #else
 
 #define irq_enter(cpu, irq)	(++local_irq_count[cpu])
 #define irq_exit(cpu, irq)	(--local_irq_count[cpu])
+
+/* Make these no-ops when not using SMP */
+#define enable_IO_APIC_irq(x)	do { } while (0)
+#define disable_IO_APIC_irq(x)	do { } while (0)
+
+#define IO_APIC_IRQ(x)	(0)
 
 #endif
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov