linux-kernel - Re: linux-next: build failure after merge of the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAErSpo6YrEZZjd=j6xoUfSvDHTT+-9g0zAb=ff2F1jA-0V9rHw@mail.gmail.com>
Date:	Mon, 5 Dec 2011 20:16:54 -0700
From:	Bjorn Helgaas <bhelgaas@...gle.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Jesse Barnes <jbarnes@...tuousgeek.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: build failure after merge of the pci tree

On Mon, Dec 5, 2011 at 5:18 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Jesse,
>
> After merging the pci tree, today's linux-next build
> (powerpc_ppc64_defconfig) failed like this:
>
> arch/powerpc/kernel/pci_64.c: In function 'pcibios_map_io_space':
> arch/powerpc/kernel/pci_64.c:201:2: error: implicit declaration of function 'pcibios_phb_map_phb_io_space' [-Werror=implicit-function-declaration]
>
> Caused by commit fb8fca4ff3f7 ("powerpc/PCI: split PHB part out of
> pcibios_map_io_space()").
>
> arch/powerpc/kernel/pci-common.c: In function 'pcibios_scan_phb':
> arch/powerpc/kernel/pci-common.c:1726:7: error: incompatible type for argument 5 of 'pci_create_root_bus'
> include/linux/pci.h:665:17: note: expected 'struct list_head *' but argument is of type 'struct list_head'
>
> Caused by commit 3c73944e7ace ("powerpc/PCI: convert to
> pci_create_root_bus()").
>
> I have used the pci tree from next-20111205 for today.
> --
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> http://www.canb.auug.org.au/~sfr/

I fixed these; the updated patches are on
git://github.com/bjorn-helgaas/linux.git on
the "pci-scan-v4" branch (head f9da8b214fef1ac4072e4af2a663293ab965f796).

Here's the incremental diff from v3 to v4 (hand-created and whitespace-damaged):

diff --git a/c4677881a:arch/powerpc/kernel/pci_64.c
b/f9da8b214:arch/powerpc/kernel/pci_64.c
index 4401425..3318d39 100644
--- a/c4677881a:arch/powerpc/kernel/pci_64.c
+++ b/f9da8b214:arch/powerpc/kernel/pci_64.c
@@ -197,7 +198,7 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)
                return 0;
        }

-       return pcibios_phb_map_phb_io_space(pci_bus_to_host(bus));
+       return pcibios_map_phb_io_space(pci_bus_to_host(bus));
 }
 EXPORT_SYMBOL_GPL(pcibios_map_io_space);

diff --git a/c4677881a:arch/powerpc/kernel/pci-common.c
b/f9da8b214:arch/powerpc/kernel/pci-common.c
index 8c47c57..2aa707b 100644
--- a/c4677881a:arch/powerpc/kernel/pci-common.c
+++ b/f9da8b214:arch/powerpc/kernel/pci-common.c
@@ -1711,7 +1712,7 @@ void __devinit pcibios_scan_phb(struct
pci_controller *hose)

        /* Create an empty bus for the toplevel */
        bus = pci_create_root_bus(hose->parent, hose->first_busno,
-                                 hose->ops, hose, resources);
+                                 hose->ops, hose, &resources);
        if (bus == NULL) {
                pr_err("Failed to create bus for PCI domain %04x\n",
                        hose->global_number);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/