Skip to content

Commit

Permalink
x86/pci merge: fixing numaq initialization
Browse files Browse the repository at this point in the history
Patch d49c428 (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>
  • Loading branch information
Robert Richter authored and Ingo Molnar committed Jul 10, 2008
1 parent 15e551d commit 3f68f7d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
3 changes: 3 additions & 0 deletions arch/x86/pci/legacy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
10 changes: 1 addition & 9 deletions arch/x86/pci/numa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

static int __init pci_numa_init(void)
int __init pci_numa_init(void)
{
int quad;

Expand All @@ -176,11 +176,3 @@ static int __init pci_numa_init(void)
}
return 0;
}

static __init int pci_subsys_init(void)
{
pci_numa_init();
pcibios_irq_init();
pcibios_init();
}
subsys_initcall(pci_subsys_init);
1 change: 1 addition & 0 deletions arch/x86/pci/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ extern void __init dmi_check_skip_isa_align(void);
/* some common used subsys_initcalls */
extern int __init pci_acpi_init(void);
extern int __init pcibios_irq_init(void);
extern int __init pci_numa_init(void);
extern int __init pcibios_init(void);

/* pci-mmconfig.c */
Expand Down

0 comments on commit 3f68f7d

Please sign in to comment.