Subject: Re: linux-next: Tree for July 14

From: Takashi Iwai <[email-masked]>
Date: Mon, 14 Jul 2008 16:20:44 +0000 (UTC)

At Mon, 14 Jul 2008 20:12:49 +1000,
Stephen Rothwell wrote:
> 
> Hi all,
> 
> With the opening of the merge window, I am hoping my job becomes easier
> again ... :-)

The build of next-20080714 failed on ppc32:

  CC [M]  drivers/infiniband/core/addr.o
In file included from include/rdma/ib_addr.h:41,
                 from drivers/infiniband/core/addr.c:44:
include/rdma/ib_verbs.h: In function 'ib_dma_map_single_attrs':
include/rdma/ib_verbs.h:1634: error: implicit declaration of function 'dma_map_single_attrs'
include/rdma/ib_verbs.h: In function 'ib_dma_unmap_single_attrs':
include/rdma/ib_verbs.h:1643: error: implicit declaration of function 'dma_unmap_single_attrs'
include/rdma/ib_verbs.h:1644: warning: 'return' with a value, in function returning void
include/rdma/ib_verbs.h: In function 'ib_dma_map_sg_attrs':
include/rdma/ib_verbs.h:1721: error: implicit declaration of function 'dma_map_sg_attrs'
include/rdma/ib_verbs.h: In function 'ib_dma_unmap_sg_attrs':
include/rdma/ib_verbs.h:1729: error: implicit declaration of function 'dma_unmap_sg_attrs'
make[3]: *** [drivers/infiniband/core/addr.o] Error 1

The following patch fixed the build, at least.  Not sure whether it's
the right fix, though.

Takashi

---
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 140ae05..007681c 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -113,7 +113,7 @@ config PPC
 	select HAVE_LMB
 	select USE_GENERIC_SMP_HELPERS if SMP
 	select HAVE_OPROFILE
-	select HAVE_DMA_ATTRS
+	select HAVE_DMA_ATTRS if PPC64
 
 config EARLY_PRINTK
 	bool