8dd779b19c
So far subsys_initcalls has been executed in this order depending on the object order in the Makefile: arch/x86/pci/visws.c:subsys_initcall(pcibios_init); arch/x86/pci/numa.c:subsys_initcall(pci_numa_init); arch/x86/pci/acpi.c:subsys_initcall(pci_acpi_init); arch/x86/pci/legacy.c:subsys_initcall(pci_legacy_init); arch/x86/pci/irq.c:subsys_initcall(pcibios_irq_init); arch/x86/pci/common.c:subsys_initcall(pcibios_init); This patch removes the ordering dependency. There is now only one subsys_initcall function that contains subsystem initialization code with a defined order. Signed-off-by: Robert Richter <robert.richter@amd.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
20 lines
557 B
Makefile
20 lines
557 B
Makefile
obj-y := i386.o init.o
|
|
|
|
obj-$(CONFIG_PCI_BIOS) += pcbios.o
|
|
obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_$(BITS).o direct.o mmconfig-shared.o
|
|
obj-$(CONFIG_PCI_DIRECT) += direct.o
|
|
obj-$(CONFIG_PCI_OLPC) += olpc.o
|
|
|
|
pci-y := fixup.o
|
|
pci-$(CONFIG_ACPI) += acpi.o
|
|
pci-y += legacy.o irq.o
|
|
|
|
# Careful: VISWS overrule the pci-y above. The colons are
|
|
# therefor correct. This needs a proper fix by distangling the code.
|
|
pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
|
|
|
|
pci-$(CONFIG_X86_NUMAQ) += numa.o
|
|
|
|
obj-y += $(pci-y) common.o early.o
|
|
obj-y += amd_bus.o
|