From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936910Ab0COVu3 (ORCPT ); Mon, 15 Mar 2010 17:50:29 -0400 Received: from mail-vw0-f46.google.com ([209.85.212.46]:35981 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932222Ab0COVuZ convert rfc822-to-8bit (ORCPT ); Mon, 15 Mar 2010 17:50:25 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=BLNyjsUG9RwDtYl0h4uMCp9S06SRvZTcgK2ADwG7JDIi/irQI2a+c+8iWxPigpvR+U IEFj+qfcK11QQZC3NmUoQ6+LlN0Zkt/46/z5w9a17M6nEO/O0POzAmt7bH+/6CSYhKuR ZeTCXMeQlY4Q0o6Aklu0AS11LvlxJKOKN+fA0= MIME-Version: 1.0 In-Reply-To: <20100315192321I.fujita.tomonori@lab.ntt.co.jp> References: <4B9DDCD8.4070902@orcon.net.nz> <20100315192321I.fujita.tomonori@lab.ntt.co.jp> Date: Mon, 15 Mar 2010 17:50:24 -0400 Message-ID: Subject: Re: Alpha: Compilation error 2.6.34-rc1 git a3d3203e4b From: Matt Turner To: FUJITA Tomonori Cc: mcree@orcon.net.nz, linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, akpm@linux-foundation.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 15, 2010 at 6:23 AM, FUJITA Tomonori wrote: > On Mon, 15 Mar 2010 20:08:08 +1300 > Michael Cree wrote: > >> I note that for_each_sg is defined in include/linux/scatterlist.h, which >> arch/alpha/include/asm/dma-mapping.h attempts to load, however >> include/linux/scatterlist.h was the one that included (indirectly) >> arch/alpha/include/asm/dma-mapping.h.  There is therefore a complete >> loop of includes from include/linux/scatterlist.h back to itself. > > Very sorry about that. Seems that I broke CONFIG_ALPHA_{TSUNAMI, > TITAN, RAWHIDE, MARVEL}. > > = > From: FUJITA Tomonori > Subject: [PATCH] alpha: fix compile errors in dma-mapping-common.h > > The commit c186caca3dbe7f44da624cb4f9d78e1b1dfb13b8 leads to the > following errors with CONFIG_ALPHA_{TSUNAMI, TITAN, RAWHIDE, MARVEL}: > > /home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h: In function `dma_map_sg_attrs': > /home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h:49: error: implicit declaration of function `for_each_sg' > /home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h:50: error: syntax error before "kmemcheck_mark_initialized" > > Signed-off-by: FUJITA Tomonori > Reported-by: Michael Cree > --- >  arch/alpha/include/asm/core_marvel.h  |    1 - >  arch/alpha/include/asm/core_mcpcia.h  |    1 - >  arch/alpha/include/asm/core_titan.h   |    1 - >  arch/alpha/include/asm/core_tsunami.h |    1 - >  4 files changed, 0 insertions(+), 4 deletions(-) > > diff --git a/arch/alpha/include/asm/core_marvel.h b/arch/alpha/include/asm/core_marvel.h > index 30d55fe..dad300f 100644 > --- a/arch/alpha/include/asm/core_marvel.h > +++ b/arch/alpha/include/asm/core_marvel.h > @@ -12,7 +12,6 @@ >  #define __ALPHA_MARVEL__H__ > >  #include > -#include >  #include > >  #include > diff --git a/arch/alpha/include/asm/core_mcpcia.h b/arch/alpha/include/asm/core_mcpcia.h > index acf55b4..21ac533 100644 > --- a/arch/alpha/include/asm/core_mcpcia.h > +++ b/arch/alpha/include/asm/core_mcpcia.h > @@ -6,7 +6,6 @@ >  #define MCPCIA_ONE_HAE_WINDOW 1 > >  #include > -#include >  #include > >  /* > diff --git a/arch/alpha/include/asm/core_titan.h b/arch/alpha/include/asm/core_titan.h > index a17f6f3..8cf79d1 100644 > --- a/arch/alpha/include/asm/core_titan.h > +++ b/arch/alpha/include/asm/core_titan.h > @@ -2,7 +2,6 @@ >  #define __ALPHA_TITAN__H__ > >  #include > -#include >  #include > >  /* > diff --git a/arch/alpha/include/asm/core_tsunami.h b/arch/alpha/include/asm/core_tsunami.h > index 58d4fe4..8e39ecf 100644 > --- a/arch/alpha/include/asm/core_tsunami.h > +++ b/arch/alpha/include/asm/core_tsunami.h > @@ -2,7 +2,6 @@ >  #define __ALPHA_TSUNAMI__H__ > >  #include > -#include >  #include > >  /* > -- > 1.7.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-alpha" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at  http://vger.kernel.org/majordomo-info.html > Thanks for the fix. Will get this into my tree and to Linus ASAP. Matt