diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-17 10:51:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-17 10:51:55 -0700 |
| commit | 499ee0710f9881423d807c6ecc451c5e1bd5ff62 (patch) | |
| tree | 27f94b3d81e7c3e5dbc97b7b1fa2d16257fc5af4 /arch/x86/include | |
| parent | 8e3b3bb5e5ac064f83a8556100f10b7dfa1c719b (diff) | |
| parent | 857fdc53a0a90c3ba7fcf5b1fb4c7a62ae03cf82 (diff) | |
| download | blackbird-op-linux-499ee0710f9881423d807c6ecc451c5e1bd5ff62.tar.gz blackbird-op-linux-499ee0710f9881423d807c6ecc451c5e1bd5ff62.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
x86/pci: insert ioapic resource before assigning unassigned resources
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/io_apic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index daf866ed0612..330ee807f89e 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h @@ -161,6 +161,7 @@ extern int io_apic_set_pci_routing(struct device *dev, int irq, struct io_apic_irq_attr *irq_attr); extern int (*ioapic_renumber_irq)(int ioapic, int irq); extern void ioapic_init_mappings(void); +extern void ioapic_insert_resources(void); extern struct IO_APIC_route_entry **alloc_ioapic_entries(void); extern void free_ioapic_entries(struct IO_APIC_route_entry **ioapic_entries); @@ -180,6 +181,7 @@ extern void ioapic_write_entry(int apic, int pin, #define io_apic_assign_pci_irqs 0 static const int timer_through_8259 = 0; static inline void ioapic_init_mappings(void) { } +static inline void ioapic_insert_resources(void) { } static inline void probe_nr_irqs_gsi(void) { } #endif |
