Hi Dan, On Thu, 20 Nov 2008 13:30:36 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Today's linux-next build (powerpc ppc64_defconfig) failed like this: > > net/core/dev.c: In function 'net_dev_init': > net/core/dev.c:4775: error: implicit declaration of function 'netdev_dma_register' > > A bad interaction between commit 505d4f73dda9e20d59da05008f1f5eb432613e71 > "net: Guaranetee the proper ordering of the loopback device. v2" from the > net tree (which moved a call to netdev_dma_register) and commit > 8f3da0d613494b02f8628bb5dbf2366f0298505c "dmaengine: kill struct > dma_client and supporting infrastructure" from the async_tx tree (which > removes the call). > > I added the below patch to fix up the merge and can carry it. This now occurs when I merge the async_tx tree as the net tree has been merged into Linus' tree. You should fix this (by merging Linus' tree into yours and doing the fixup below as part of the merge commit) before asking Linus to pull your tree. > diff --git a/net/core/dev.c b/net/core/dev.c > index c3f5713..e9cf36e 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -4772,8 +4772,6 @@ static int __init net_dev_init(void) > if (register_pernet_device(&default_device_ops)) > goto out; > > - netdev_dma_register(); > - > open_softirq(NET_TX_SOFTIRQ, net_tx_action); > open_softirq(NET_RX_SOFTIRQ, net_rx_action); > -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpGO04ILwGmN.pgp
Description: PGP signature
