patch-2.4.23 linux-2.4.23/include/asm-x86_64/io_apic.h
Next file: linux-2.4.23/include/asm-x86_64/kdebug.h
Previous file: linux-2.4.23/include/asm-x86_64/ia32.h
Back to the patch index
Back to the overall index
- Lines: 34
- Date:
2003-11-28 10:26:21.000000000 -0800
- Orig file:
linux-2.4.22/include/asm-x86_64/io_apic.h
- Orig date:
2003-08-25 04:44:44.000000000 -0700
diff -urN linux-2.4.22/include/asm-x86_64/io_apic.h linux-2.4.23/include/asm-x86_64/io_apic.h
@@ -141,13 +141,30 @@
*/
#define io_apic_assign_pci_irqs (mp_irq_entries && !skip_ioapic_setup)
-#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 */
extern int io_apic_get_unique_id (int ioapic, int apic_id);
extern int io_apic_get_version (int ioapic);
extern int io_apic_get_redir_entries (int ioapic);
-extern int io_apic_set_pci_routing (int ioapic, int pin, int irq);
+extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int, int);
#endif
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)