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/pci/i386.c | |
| parent | 8e3b3bb5e5ac064f83a8556100f10b7dfa1c719b (diff) | |
| parent | 857fdc53a0a90c3ba7fcf5b1fb4c7a62ae03cf82 (diff) | |
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/pci/i386.c')
| -rw-r--r-- | arch/x86/pci/i386.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 0fb56db16d18..52e62e57fedd 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -35,6 +35,7 @@ #include <asm/pat.h> #include <asm/e820.h> #include <asm/pci_x86.h> +#include <asm/io_apic.h> static int @@ -227,6 +228,12 @@ void __init pcibios_resource_survey(void) pcibios_allocate_resources(1); e820_reserve_resources_late(); + /* + * Insert the IO APIC resources after PCI initialization has + * occured to handle IO APICS that are mapped in on a BAR in + * PCI space, but before trying to assign unassigned pci res. + */ + ioapic_insert_resources(); } /** |