From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751820Ab0CDCaR (ORCPT ); Wed, 3 Mar 2010 21:30:17 -0500 Received: from acsinet12.oracle.com ([141.146.126.234]:63717 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750982Ab0CDCaO (ORCPT ); Wed, 3 Mar 2010 21:30:14 -0500 Message-ID: <4B8F1B0E.7060002@oracle.com> Date: Wed, 03 Mar 2010 18:29:34 -0800 From: Randy Dunlap Organization: Oracle Linux Engineering User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091209 Fedora/3.0-3.fc11 Thunderbird/3.0 MIME-Version: 1.0 To: FUJITA Tomonori CC: linux-kernel@vger.kernel.org, akpm@linux-foundation.org Subject: Re: mmotm 2010-03-02-18-38 uploaded (dma unmapping) References: <4B8EB65F.9060800@oracle.com> <20100304080822V.fujita.tomonori@lab.ntt.co.jp> <4B8EEEBA.70001@oracle.com> <20100304102217B.fujita.tomonori@lab.ntt.co.jp> In-Reply-To: <20100304102217B.fujita.tomonori@lab.ntt.co.jp> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Source-IP: acsmt355.oracle.com [141.146.40.155] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090207.4B8F1B2A.00B0:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/03/10 17:22, FUJITA Tomonori wrote: > On Wed, 03 Mar 2010 15:20:26 -0800 > Randy Dunlap wrote: > >>>> drivers/net/chelsio/sge.c:164: error: expected specifier-qualifier-list before 'DECLARE_DMA_UNMAP_ADDR' >>>> drivers/net/chelsio/sge.c:170: error: expected specifier-qualifier-list before 'DECLARE_DMA_UNMAP_ADDR' >>>> >>>> drivers/infiniband/hw/amso1100/c2_mq.h:74: error: expected specifier-qualifier-list before 'DECLARE_DMA_UNMAP_ADDR' >>>> drivers/infiniband/hw/amso1100/c2_provider.h:53: error: expected specifier-qualifier-list before 'DECLARE_DMA_U >>>> NMAP_ADDR' >>>> >>>> drivers/net/cxgb3/sge.c:120: error: expected specifier-qualifier-list before 'DECLARE_DMA_UNMAP_ADDR' >>>> drivers/net/cxgb3/sge.c:210: error: expected specifier-qualifier-list before 'DECLARE_DMA_UNMAP_ADDR' >>> >>> Sorry. I can't reproduce this here. Can you send .config? >> >> >> Sure (attached), but there is a different config file for each driver case above. >> >> chelsio == config-r8176 >> >> amso1100 == config-r8179 >> >> cxgb3 == config=r8186 >> >> All are ARCH=i386 builds. > > Ah, somehow I put my silly typo... really sorry about that. > > The following patch can be applied to mm after applying another > dma_unmap fix: > > http://marc.info/?l=linux-kernel&m=126759183815898&w=2 > > > Andrew, can you apply the following patch. This should be fold into > dma-mappingh-add-the-dma_unmap-state-api.patch after > dma-mappingh-add-the-dma_unmap-state-api-fix.patch. > > > = > From: FUJITA Tomonori > Subject: [PATCH] fix DECLARE_DMA_UNMAP_ADD_ADDR typo with CONFIG_NEED_DMA_MAP_STATE disabled > > Signed-off-by: FUJITA Tomonori > --- > include/linux/dma-mapping.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h > index e00c5c9..ca32ed7 100644 > --- a/include/linux/dma-mapping.h > +++ b/include/linux/dma-mapping.h > @@ -248,7 +248,7 @@ struct dma_attrs; > #define dma_unmap_len(PTR, LEN_NAME) ((PTR)->LEN_NAME) > #define dma_unmap_len_set(PTR, LEN_NAME, VAL) (((PTR)->LEN_NAME) = (VAL)) > #else > -#define DEFINE_DMA_MAP_ADDR(ADDR_NAME) > +#define DEFINE_DMA_UNMAP_ADDR(ADDR_NAME) > #define DEFINE_DMA_UNMAP_LEN(LEN_NAME) > #define dma_unmap_addr(PTR, ADDR_NAME) (0) > #define dma_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) Thanks. Acked-by: Randy Dunlap -- ~Randy