Messages in this thread Patch in this message | | | Date | Wed, 12 Oct 2005 12:00:50 -0600 | From | Matthew Wilcox <> | Subject | Re: [ACPI] 2.6.14-rc4 ACPI/PCI compile problem |
| |
On Tue, Oct 11, 2005 at 05:17:01PM -0600, Bjorn Helgaas wrote: > Please try the following patch and confirm whether it works. > > [i386 kbuild] Don't clobber pci-y when X86_VISWS or X86_NUMAQ > > Previously, enabling CONFIG_X86_VISWS or CONFIG_X86_NUMAQ > clobbered any previous contents of pci-y, because they used > ":=" instead of "+=".
This isn't correct. We want to get rid of some of the current contents of pci-y when NUMAQ or VISWS are enabled. I'm not quite sure what the right fix is here. Maybe something like ...
--- arch/i386/pci/Makefile 14 Sep 2005 12:54:20 -0000 1.3 +++ arch/i386/pci/Makefile 12 Oct 2005 17:51:19 -0000 @@ -4,11 +4,11 @@ obj-$(CONFIG_PCI_BIOS) += pcbios.o obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o obj-$(CONFIG_PCI_DIRECT) += direct.o -pci-y := fixup.o -pci-$(CONFIG_ACPI) += acpi.o -pci-y += legacy.o irq.o +acpi-$(CONFIG_ACPI) := acpi.o + +pci-y := fixup.o $(acpi-y) legacy.o irq.o pci-$(CONFIG_X86_VISWS) := visws.o fixup.o -pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o +pci-$(CONFIG_X86_NUMAQ) := numa.o $(acpi-y) irq.o obj-y += $(pci-y) common.o This mess really needs some more eyes on it. For example, should fixups.o really be enabled on visws but disabled on numaq? I suspect both want legacy.o disabled. Does it make sense to enable ACPI on a NUMAQ system? I don't know enough about them.
And it /really/ needs some commentary. Here's my first cut at it, based on my memories of editing it several years ago:
# A little more complex than most Makefiles. # Neither the VISWS nor the NUMAQ configs want to see legacy.o compiled in. # VISWS doesn't have ACPI to worry about, but NUMAQ might # Order is important -- don't rearrange the order of files here.
Help most gratefully received from people who really understand these boxes! - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |