patch-2.4.23 linux-2.4.23/include/asm-i386/io_apic.h
Next file: linux-2.4.23/include/asm-i386/msr.h
Previous file: linux-2.4.23/include/asm-i386/hc_sl811-hw.h
Back to the patch index
Back to the overall index
- Lines: 37
- Date:
2003-11-28 10:26:21.000000000 -0800
- Orig file:
linux-2.4.22/include/asm-i386/io_apic.h
- Orig date:
2003-08-25 04:44:43.000000000 -0700
diff -urN linux-2.4.22/include/asm-i386/io_apic.h linux-2.4.23/include/asm-i386/io_apic.h
@@ -131,9 +131,6 @@
(void) *(IO_APIC_BASE(apic)+4);
}
-/* 1 if "noapic" boot option passed */
-extern int skip_ioapic_setup;
-
/*
* If we use the IO-APIC for IRQ routing, disable automatic
* assignment of PCI IRQ's.
@@ -147,8 +144,24 @@
extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low);
#endif
-#else /* !CONFIG_X86_IO_APIC */
+extern int skip_ioapic_setup; /* 1 for "noapic" */
+
+static inline void disable_ioapic_setup(void)
+{
+ skip_ioapic_setup = 1;
+}
+
+static inline int ioapic_setup_disabled(void)
+{
+ return skip_ioapic_setup;
+}
+
+#else /* !CONFIG_X86_IO_APIC */
#define io_apic_assign_pci_irqs 0
-#endif
+
+static inline void disable_ioapic_setup(void)
+{ }
+
+#endif /* !CONFIG_X86_IO_APIC */
#endif
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)