diff options
Diffstat (limited to 'include/asm-i386/io_apic.h')
-rw-r--r-- | include/asm-i386/io_apic.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/include/asm-i386/io_apic.h b/include/asm-i386/io_apic.h index 5d309275a1dc..276ea7e8144a 100644 --- a/include/asm-i386/io_apic.h +++ b/include/asm-i386/io_apic.h | |||
@@ -12,46 +12,6 @@ | |||
12 | 12 | ||
13 | #ifdef CONFIG_X86_IO_APIC | 13 | #ifdef CONFIG_X86_IO_APIC |
14 | 14 | ||
15 | #ifdef CONFIG_PCI_MSI | ||
16 | static inline int use_pci_vector(void) {return 1;} | ||
17 | static inline void disable_edge_ioapic_vector(unsigned int vector) { } | ||
18 | static inline void mask_and_ack_level_ioapic_vector(unsigned int vector) { } | ||
19 | static inline void end_edge_ioapic_vector (unsigned int vector) { } | ||
20 | #define startup_level_ioapic startup_level_ioapic_vector | ||
21 | #define shutdown_level_ioapic mask_IO_APIC_vector | ||
22 | #define enable_level_ioapic unmask_IO_APIC_vector | ||
23 | #define disable_level_ioapic mask_IO_APIC_vector | ||
24 | #define mask_and_ack_level_ioapic mask_and_ack_level_ioapic_vector | ||
25 | #define end_level_ioapic end_level_ioapic_vector | ||
26 | #define set_ioapic_affinity set_ioapic_affinity_vector | ||
27 | |||
28 | #define startup_edge_ioapic startup_edge_ioapic_vector | ||
29 | #define shutdown_edge_ioapic disable_edge_ioapic_vector | ||
30 | #define enable_edge_ioapic unmask_IO_APIC_vector | ||
31 | #define disable_edge_ioapic disable_edge_ioapic_vector | ||
32 | #define ack_edge_ioapic ack_edge_ioapic_vector | ||
33 | #define end_edge_ioapic end_edge_ioapic_vector | ||
34 | #else | ||
35 | static inline int use_pci_vector(void) {return 0;} | ||
36 | static inline void disable_edge_ioapic_irq(unsigned int irq) { } | ||
37 | static inline void mask_and_ack_level_ioapic_irq(unsigned int irq) { } | ||
38 | static inline void end_edge_ioapic_irq (unsigned int irq) { } | ||
39 | #define startup_level_ioapic startup_level_ioapic_irq | ||
40 | #define shutdown_level_ioapic mask_IO_APIC_irq | ||
41 | #define enable_level_ioapic unmask_IO_APIC_irq | ||
42 | #define disable_level_ioapic mask_IO_APIC_irq | ||
43 | #define mask_and_ack_level_ioapic mask_and_ack_level_ioapic_irq | ||
44 | #define end_level_ioapic end_level_ioapic_irq | ||
45 | #define set_ioapic_affinity set_ioapic_affinity_irq | ||
46 | |||
47 | #define startup_edge_ioapic startup_edge_ioapic_irq | ||
48 | #define shutdown_edge_ioapic disable_edge_ioapic_irq | ||
49 | #define enable_edge_ioapic unmask_IO_APIC_irq | ||
50 | #define disable_edge_ioapic disable_edge_ioapic_irq | ||
51 | #define ack_edge_ioapic ack_edge_ioapic_irq | ||
52 | #define end_edge_ioapic end_edge_ioapic_irq | ||
53 | #endif | ||
54 | |||
55 | #define IO_APIC_BASE(idx) \ | 15 | #define IO_APIC_BASE(idx) \ |
56 | ((volatile int *)(__fix_to_virt(FIX_IO_APIC_BASE_0 + idx) \ | 16 | ((volatile int *)(__fix_to_virt(FIX_IO_APIC_BASE_0 + idx) \ |
57 | + (mp_ioapics[idx].mpc_apicaddr & ~PAGE_MASK))) | 17 | + (mp_ioapics[idx].mpc_apicaddr & ~PAGE_MASK))) |
@@ -219,6 +179,4 @@ extern int (*ioapic_renumber_irq)(int ioapic, int irq); | |||
219 | static inline void disable_ioapic_setup(void) { } | 179 | static inline void disable_ioapic_setup(void) { } |
220 | #endif | 180 | #endif |
221 | 181 | ||
222 | extern int assign_irq_vector(int irq); | ||
223 | |||
224 | #endif | 182 | #endif |