Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759154Ab0HLHxr (ORCPT ); Thu, 12 Aug 2010 03:53:47 -0400 Received: from mtagate3.uk.ibm.com ([194.196.100.163]:53305 "EHLO mtagate3.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753176Ab0HLHxo (ORCPT ); Thu, 12 Aug 2010 03:53:44 -0400 Date: Thu, 12 Aug 2010 09:55:32 +0200 From: Heiko Carstens To: Sachin Sant Cc: linux-s390@vger.kernel.org, linux-kernel , FUJITA Tomonori , Andrew Morton , linux-arch@vger.kernel.org Subject: Re: Latest git build failure on s390 - dma_get_cache_alignment() Message-ID: <20100812075532.GA7814@osiris.boeblingen.de.ibm.com> References: <4C63A551.3040701@in.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4C63A551.3040701@in.ibm.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3086 Lines: 81 On Thu, Aug 12, 2010 at 01:10:01PM +0530, Sachin Sant wrote: > Latest 2.6.35 git (2.6.35-git11 : 5af568cbd...) fails to build > on s390 with following errors : > > arch/s390/mm/fault.c:396: warning: frame size of 'do_protection_exception' is 264 bytes > In file included from include/linux/dmaengine.h:26, > from include/linux/skbuff.h:30, > from include/linux/icmpv6.h:82, > from include/linux/ipv6.h:220, > from include/net/ipv6.h:16, > from include/linux/sunrpc/clnt.h:25, > from include/linux/nfs_fs.h:48, > from init/do_mounts.c:20: > include/linux/dma-mapping.h:145: error: static declaration of 'dma_get_cache_alignment' follows non-static declaration > include/asm-generic/dma-mapping-broken.h:73: error: previous declaration of 'dma_get_cache_alignment' was here > make[1]: *** [init/do_mounts.o] Error 1 > make[1]: *** Waiting for unfinished jobs.... > init/do_mounts_md.c: In function 'md_setup_drive': > init/do_mounts_md.c:241: warning: frame size of 'md_setup_drive' is 496 bytes > make: *** [init] Error 2 > make: *** Waiting for unfinished jobs.... > > The code in question was last changed via following commit > > commit 4565f0170dfc849b3629c27d769db800467baa62 > dma-mapping: unify dma_get_cache_alignment implementations Cc'ing linux-arch since the original patch got posted there as well. Patch below should fix it. Signed-off-by: Heiko Carstens --- include/asm-generic/dma-mapping-common.h | 8 ++++++++ include/linux/dma-mapping.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h index 0c80bb3..8079c72 100644 --- a/include/asm-generic/dma-mapping-common.h +++ b/include/asm-generic/dma-mapping-common.h @@ -160,6 +160,14 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, } +static inline int dma_get_cache_alignment(void) +{ +#ifdef ARCH_DMA_MINALIGN + return ARCH_DMA_MINALIGN; +#endif + return 1; +} + #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL) #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL) #define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, NULL) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index e0670a5..89b7e1a 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -142,14 +142,6 @@ static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask) return -EIO; } -static inline int dma_get_cache_alignment(void) -{ -#ifdef ARCH_DMA_MINALIGN - return ARCH_DMA_MINALIGN; -#endif - return 1; -} - /* flags for the coherent memory api */ #define DMA_MEMORY_MAP 0x01 #define DMA_MEMORY_IO 0x02 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/