lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86/pci merge: fixing numaq initialization

Browse Source 
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>
This commit is contained in:
Robert Richter
2008-07-10 18:58:24 +02:00
committed by Ingo Molnar
parent 15e551d25e
commit 3f68f7d945
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/pci/legacy.c
View File

@@ -62,6 +62,9 @@ int __init pci_subsys_init(void)
#endif #endif
pci_legacy_init(); pci_legacy_init();
pcibios_irq_init(); pcibios_irq_init();
#ifdef CONFIG_X86_NUMAQ
pci_numa_init();
#endif
pcibios_init(); pcibios_init();
} }
subsys_initcall(pci_subsys_init); subsys_initcall(pci_subsys_init);

10
arch/x86/pci/numa.c
View File

@@ -151,7 +151,7 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d)
} }
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx);
static int __init pci_numa_init(void) int __init pci_numa_init(void)
{ {
int quad; int quad;
@@ -176,11 +176,3 @@ static int __init pci_numa_init(void)
} }
return 0; return 0;
} }
static __init int pci_subsys_init(void)
{
pci_numa_init();
pcibios_irq_init();
pcibios_init();
}
subsys_initcall(pci_subsys_init);

1
arch/x86/pci/pci.h
View File

@@ -107,6 +107,7 @@ extern void __init dmi_check_skip_isa_align(void);
/* some common used subsys_initcalls */ /* some common used subsys_initcalls */
extern int __init pci_acpi_init(void); extern int __init pci_acpi_init(void);
extern int __init pcibios_irq_init(void); extern int __init pcibios_irq_init(void);
extern int __init pci_numa_init(void);
extern int __init pcibios_init(void); extern int __init pcibios_init(void);
/* pci-mmconfig.c */ /* pci-mmconfig.c */