diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-02 21:24:30 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-05-04 20:04:45 +0200 |
commit | 48b83d2425d7781bb625b1c37b5f2a8963b6e23b (patch) | |
tree | 06ce6081c5ad7cde2790beaf14410bd09616c3dd /arch/x86/pci/Makefile_32 | |
parent | afa26be86b65a7183ceac29bdf1f51d6fc6932f0 (diff) | |
download | kernel_samsung_smdk4412-48b83d2425d7781bb625b1c37b5f2a8963b6e23b.zip kernel_samsung_smdk4412-48b83d2425d7781bb625b1c37b5f2a8963b6e23b.tar.gz kernel_samsung_smdk4412-48b83d2425d7781bb625b1c37b5f2a8963b6e23b.tar.bz2 |
x86: undo visws/numaq build changes
arch/x86/pci/Makefile_32 has a nasty detail. VISWS and NUMAQ build
override the generic pci-y rules. This needs a proper cleanup, but
that needs more thoughts. Undo
commit 895d30935ebe05f192e844792668bf8d19deaae7
x86: numaq fix
do not override the existing pci-y rule when adding visws or
numaq rules.
There is also a stupid init function ordering problem vs. acpi.o
Add comments to the Makefile to avoid tripping over this again.
Remove the srat stub code in discontig_32.c to allow a proper NUMAQ
build.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/pci/Makefile_32')
-rw-r--r-- | arch/x86/pci/Makefile_32 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32 index 7fa5198..89ec35d 100644 --- a/arch/x86/pci/Makefile_32 +++ b/arch/x86/pci/Makefile_32 @@ -6,11 +6,19 @@ obj-$(CONFIG_PCI_DIRECT) += direct.o obj-$(CONFIG_PCI_OLPC) += olpc.o pci-y := fixup.o + +# Do not change the ordering here. There is a nasty init function +# ordering dependency which breaks when you move acpi.o below +# legacy/irq.o pci-$(CONFIG_ACPI) += acpi.o pci-y += legacy.o irq.o -pci-$(CONFIG_X86_VISWS) += visws.o fixup.o -pci-$(CONFIG_X86_NUMAQ) += numa.o irq.o +# Careful: VISWS and NUMAQ 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 irq.o + +# Necessary for NUMAQ as well pci-$(CONFIG_NUMA) += mp_bus_to_node.o obj-y += $(pci-y) common.o early.o |