Re: linux-next: Tree for Jan 9 (arch/x86/pci/amd_bus.c)

Re: linux-next: Tree for Jan 9 (arch/x86/pci/amd_bus.c)

[Bjorn Helgaas]

[-- Attachment #1: Type: text/plain, Size: 587 bytes --]

On Mon, Jan 9, 2012 at 2:05 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> on several i386 builds:
>
> amd_bus.c:(.init.text+0x134b): undefined reference to `amd_get_mmconfig_range'

This is my fault.  I moved some code from amd_bus.c to amd_nb.c, and builds with

        CONFIG_PCI=y
        # CONFIG_AMD_NB not set

now fail.  The attached patch should fix it.  I'll repost the series
("x86/PCI: amd: factor out MMCONFIG discovery") with the fix.

Yinghai, it looks to me like there's no reason to build amd_bus.o
unless we have CONFIG_AMD_NB=y, but speak up if I'm wrong :)

Bjorn

[-- Attachment #2: patch.amd-build-fix --]
[-- Type: application/octet-stream, Size: 874 bytes --]

commit c762fe5815f1220159f257ec4cf751b47bab98ff
Author: Bjorn Helgaas <bhelgaas@google.com>
Date:   Mon Jan 9 13:42:12 2012 -0700

    x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=y
    
    We only need amd_bus.o for AMD systems with PCI.  arch/x86/pci/Makefile
    already depends on CONFIG_PCI=y, so this patch just adds the dependency
    on CONFIG_AMD_NB.
    
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 6b8759f..d24d3da 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -18,8 +18,9 @@ obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o
 obj-$(CONFIG_X86_MRST)		+= mrst.o
 
 obj-y				+= common.o early.o
-obj-y				+= amd_bus.o bus_numa.o
+obj-y				+= bus_numa.o
 
+obj-$(CONFIG_AMD_NB)		+= amd_bus.o
 obj-$(CONFIG_PCI_CNB20LE_QUIRK)	+= broadcom_bus.o
 
 ifeq ($(CONFIG_PCI_DEBUG),y)

Re: linux-next: Tree for Jan 9 (arch/x86/pci/amd_bus.c)

[Randy Dunlap]

On 01/09/2012 02:40 PM, Bjorn Helgaas wrote:
> On Mon, Jan 9, 2012 at 2:05 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
>> on several i386 builds:
>>
>> amd_bus.c:(.init.text+0x134b): undefined reference to `amd_get_mmconfig_range'
> 
> This is my fault.  I moved some code from amd_bus.c to amd_nb.c, and builds with
> 
>         CONFIG_PCI=y
>         # CONFIG_AMD_NB not set
> 
> now fail.  The attached patch should fix it.  I'll repost the series
> ("x86/PCI: amd: factor out MMCONFIG discovery") with the fix.
> 
> Yinghai, it looks to me like there's no reason to build amd_bus.o
> unless we have CONFIG_AMD_NB=y, but speak up if I'm wrong :)

Seems to work for me.  Thanks.


-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***