diff options
| author | Robert Richter <robert.richter@amd.com> | 2008-07-11 06:14:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 15:22:57 -0400 |
| commit | 060b9708a0c04cf9af69c128ef7954b6f0a84180 (patch) | |
| tree | 0837ee2b02484d7618c4668fe0d5f4464e66ff38 | |
| parent | 2510495e208e7a69b64fcf5cdf8966d873536d9e (diff) | |
x86/pci: Changing subsystem initialization order for NUMA
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/pci/legacy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c index 132876cc6fca..60e8caa13563 100644 --- a/arch/x86/pci/legacy.c +++ b/arch/x86/pci/legacy.c | |||
| @@ -57,14 +57,14 @@ static int __init pci_legacy_init(void) | |||
| 57 | 57 | ||
| 58 | int __init pci_subsys_init(void) | 58 | int __init pci_subsys_init(void) |
| 59 | { | 59 | { |
| 60 | #ifdef CONFIG_X86_NUMAQ | ||
| 61 | pci_numa_init(); | ||
| 62 | #endif | ||
| 60 | #ifdef CONFIG_ACPI | 63 | #ifdef CONFIG_ACPI |
| 61 | pci_acpi_init(); | 64 | pci_acpi_init(); |
| 62 | #endif | 65 | #endif |
| 63 | pci_legacy_init(); | 66 | pci_legacy_init(); |
| 64 | pcibios_irq_init(); | 67 | pcibios_irq_init(); |
| 65 | #ifdef CONFIG_X86_NUMAQ | ||
| 66 | pci_numa_init(); | ||
| 67 | #endif | ||
| 68 | pcibios_init(); | 68 | pcibios_init(); |
| 69 | 69 | ||
| 70 | return 0; | 70 | return 0; |
