diff options
| author | Robert Richter <robert.richter@amd.com> | 2008-07-10 20:58:24 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 21:14:43 +0400 |
| commit | 3f68f7d945e37e4d4bf1da445a285c59a6185815 (patch) | |
| tree | 978360d1bf1b4f9ed59fe40e87c7298cb3c4af76 /arch/x86/pci/legacy.c | |
| parent | 15e551d25e5a600c76cb92171357d4cbe2d1bf7a (diff) | |
| download | linux-3f68f7d945e37e4d4bf1da445a285c59a6185815.tar.xz | |
x86/pci merge: fixing numaq initialization
Patch d49c4288 (tip/x86/mpparse) introduced some changes in calling
subsys_init calls if CONFIG_X86_NUMAQ option is set. This patch
updates subsystem initalization according to this changes.
Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: Robert Richter <robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/pci/legacy.c')
| -rw-r--r-- | arch/x86/pci/legacy.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c index 3c1d795cbbe9..d8b6e928590b 100644 --- a/arch/x86/pci/legacy.c +++ b/arch/x86/pci/legacy.c @@ -62,6 +62,9 @@ int __init pci_subsys_init(void) #endif pci_legacy_init(); pcibios_irq_init(); +#ifdef CONFIG_X86_NUMAQ + pci_numa_init(); +#endif pcibios_init(); } subsys_initcall(pci_subsys_init); |