patch-2.4.0-test2 linux/include/asm-i386/io_apic.h

• Lines: 32
• Date: Fri Jun 23 21:30:20 2000
• Orig file: v2.4.0-test1/linux/include/asm-i386/io_apic.h
• Orig date: Fri Jan 21 18:19:17 2000

diff -u --recursive --new-file v2.4.0-test1/linux/include/asm-i386/io_apic.h linux/include/asm-i386/io_apic.h
@@ -1,6 +1,7 @@
 #ifndef __ASM_IO_APIC_H
 #define __ASM_IO_APIC_H
 
+#include <linux/config.h>
 #include <asm/types.h>
 
 /*
@@ -9,6 +10,8 @@
  * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar
  */
 
+#ifdef CONFIG_X86_IO_APIC
+
 #define IO_APIC_BASE(idx) \
 		((volatile int *)__fix_to_virt(FIX_IO_APIC_BASE_0 + idx))
 
@@ -130,5 +133,14 @@
 extern int skip_ioapic_setup;
 extern void IO_APIC_init_uniprocessor (void);
 
+/*
+ * If we use the IO-APIC for IRQ routing, disable automatic
+ * assignment of PCI IRQ's.
+ */
+#define io_apic_assign_pci_irqs (mp_irq_entries != 0)
+
+#else  /* !CONFIG_X86_IO_APIC */
+#define io_apic_assign_pci_irqs 0
 #endif
 
+#endif