[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20111207170533.3dea865573c916e79d274eca@canb.auug.org.au>
Date: Wed, 7 Dec 2011 17:05:33 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jesse Barnes <jbarnes@...tuousgeek.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Bjorn Helgaas <bhelgaas@...gle.com>,
"David S. Miller" <davem@...emloft.net>
Subject: linux-next: build failure after merge of the final tree (pci tree
related)
Hi all,
After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:
arch/sparc/kernel/pci.c: In function 'pci_scan_one_pbm':
arch/sparc/kernel/pci.c:697: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 fa3cec8aff53 ("sparc/PCI: convert to pci_create_root_bus
()"). Same typo as for the powerpc tree. :-( Please double check the
rest of those changes, please.
I applied the following patch for today.
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 7 Dec 2011 17:02:12 +1100
Subject: [PATCH] sparc/PCI: fix up typo from pci_create_root_bus conversion
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
arch/sparc/kernel/pci.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 0905dbd..bb8bc2e 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -694,7 +694,7 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,
pci_add_resource(&resources, &pbm->io_space);
pci_add_resource(&resources, &pbm->mem_space);
bus = pci_create_root_bus(parent, pbm->pci_first_busno, pbm->pci_ops,
- pbm, resources);
+ pbm, &resources);
if (!bus) {
printk(KERN_ERR "Failed to create bus for %s\n",
node->full_name);
--
1.7.7.3
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists