diff options
| -rw-r--r-- | arch/x86/include/asm/io_apic.h | 6 | ||||
| -rw-r--r-- | arch/x86/kernel/io_apic.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index 309d0e23193a..59cb4a1317b7 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h | |||
| @@ -169,6 +169,12 @@ extern void reinit_intr_remapped_IO_APIC(int); | |||
| 169 | 169 | ||
| 170 | extern void probe_nr_irqs_gsi(void); | 170 | extern void probe_nr_irqs_gsi(void); |
| 171 | 171 | ||
| 172 | extern int setup_ioapic_entry(int apic, int irq, | ||
| 173 | struct IO_APIC_route_entry *entry, | ||
| 174 | unsigned int destination, int trigger, | ||
| 175 | int polarity, int vector); | ||
| 176 | extern void ioapic_write_entry(int apic, int pin, | ||
| 177 | struct IO_APIC_route_entry e); | ||
| 172 | #else /* !CONFIG_X86_IO_APIC */ | 178 | #else /* !CONFIG_X86_IO_APIC */ |
| 173 | #define io_apic_assign_pci_irqs 0 | 179 | #define io_apic_assign_pci_irqs 0 |
| 174 | static const int timer_through_8259 = 0; | 180 | static const int timer_through_8259 = 0; |
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index 56e51eb551a5..7248ca11bdcd 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c | |||
| @@ -486,7 +486,7 @@ __ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e) | |||
| 486 | io_apic_write(apic, 0x10 + 2*pin, eu.w1); | 486 | io_apic_write(apic, 0x10 + 2*pin, eu.w1); |
| 487 | } | 487 | } |
| 488 | 488 | ||
| 489 | static void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e) | 489 | void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e) |
| 490 | { | 490 | { |
| 491 | unsigned long flags; | 491 | unsigned long flags; |
| 492 | spin_lock_irqsave(&ioapic_lock, flags); | 492 | spin_lock_irqsave(&ioapic_lock, flags); |
| @@ -1478,10 +1478,10 @@ static void ioapic_register_intr(int irq, struct irq_desc *desc, unsigned long t | |||
| 1478 | handle_edge_irq, "edge"); | 1478 | handle_edge_irq, "edge"); |
| 1479 | } | 1479 | } |
| 1480 | 1480 | ||
| 1481 | static int setup_ioapic_entry(int apic_id, int irq, | 1481 | int setup_ioapic_entry(int apic_id, int irq, |
| 1482 | struct IO_APIC_route_entry *entry, | 1482 | struct IO_APIC_route_entry *entry, |
| 1483 | unsigned int destination, int trigger, | 1483 | unsigned int destination, int trigger, |
| 1484 | int polarity, int vector) | 1484 | int polarity, int vector) |
| 1485 | { | 1485 | { |
| 1486 | /* | 1486 | /* |
| 1487 | * add it to the IO-APIC irq-routing table: | 1487 | * add it to the IO-APIC irq-routing table: |
