Re: mm snapshot broken-out-2007-11-06-02-32.tar.gz uploaded - Build Failure at fsldma.c

Re: mm snapshot broken-out-2007-11-06-02-32.tar.gz uploaded - Build Failure at fsldma.c

[Kamalesh Babulal]

Hi Andrew,

The build fails with error

  CC      net/9p/error.o
drivers/dma/fsldma.h:152: error: conflicting types for ‘in_be64’
include/asm/io.h:136: error: previous definition of ‘in_be64’ was here
drivers/dma/fsldma.h:157: error: conflicting types for ‘out_be64’
include/asm/io.h:135: error: previous definition of ‘out_be64’ was here
drivers/dma/fsldma.h:164: error: conflicting types for ‘in_le64’
include/asm/io.h:140: error: previous definition of ‘in_le64’ was here
drivers/dma/fsldma.h:169: error: conflicting types for ‘out_le64’
include/asm/io.h:145: error: previous definition of ‘out_le64’ was here
drivers/dma/fsldma.c:504: error: implicit declaration of function ‘bus_to_virt’
make[2]: *** [drivers/dma/fsldma.o] Error 1
make[1]: *** [drivers/dma] Error 2
make: *** [drivers] Error 2

This error is caused by the patch add-dma-engine-driver-for-freescale-mpc85xx-processors.patch

The following patch solves the conflict types error, but the bus_to_virt
is under the CONFIG_PPC32 ifdef and we had a discuss on the same for the
availability of the function for ppc64 at http://lkml.org/lkml/2007/10/17/524

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
--- linux-2.6.24-rc1/drivers/dma/fsldma.h	2007-11-06 09:12:09.000000000 -0500
+++ linux-2.6.24-rc1/drivers/dma/~fsldma.h	2007-11-06 09:12:31.000000000 -0500
@@ -147,7 +147,7 @@ struct fsl_dma_chan {
 #define to_fsl_desc(lh) container_of(lh, struct fsl_desc_sw, node)
 #define tx_to_fsl_desc(tx) container_of(tx, struct fsl_desc_sw, async_tx)
 
-#ifndef __powerpc64
+#ifndef __powerpc64__
 static u64 in_be64(const u64 __iomem *addr)
 {
 	return ((u64)in_be32((u32 *)addr) << 32) | (in_be32((u32 *)addr + 1));

--
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.