From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755466AbZKBPqS (ORCPT ); Mon, 2 Nov 2009 10:46:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755310AbZKBPqQ (ORCPT ); Mon, 2 Nov 2009 10:46:16 -0500 Received: from mx3.mail.elte.hu ([157.181.1.138]:44224 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755009AbZKBPqP (ORCPT ); Mon, 2 Nov 2009 10:46:15 -0500 Date: Mon, 2 Nov 2009 16:46:04 +0100 From: Ingo Molnar To: Herbert Xu Cc: Andrew Morton , Huang Ying , "linux-kernel@vger.kernel.org" , "linux-crypto@vger.kernel.org" , Daniel Walker , "H. Peter Anvin" Subject: Re: [PATCH -v4] crypto: Add PCLMULQDQ accelerated GHASH implementation Message-ID: <20091102154604.GA26453@elte.hu> References: <1253064946.15717.372.camel@yhuang-dev.sh.intel.com> <20091019025332.GA26624@gondor.apana.org.au> <20091031173015.69e8e9f8.akpm@linux-foundation.org> <20091101175043.GA25257@gondor.apana.org.au> <20091102075039.GA15942@elte.hu> <20091102142824.GA31981@gondor.apana.org.au> <20091102143258.GA23776@elte.hu> <20091102144621.GA32164@gondor.apana.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091102144621.GA32164@gondor.apana.org.au> User-Agent: Mutt/1.5.19 (2009-01-05) X-ELTE-SpamScore: 0.0 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=0.0 required=5.9 tests=none autolearn=no SpamAssassin version=3.2.5 _SUMMARY_ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Herbert Xu wrote: > On Mon, Nov 02, 2009 at 03:32:58PM +0100, Ingo Molnar wrote: > > > > Please use the standard construct and put an #ifndef __ASSEMBLY__ around > > it. > > You mean like this? > > diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h > index 0b20bbb..e22d237 100644 > --- a/arch/x86/include/asm/i387.h > +++ b/arch/x86/include/asm/i387.h > @@ -10,6 +10,13 @@ > #ifndef _ASM_X86_I387_H > #define _ASM_X86_I387_H > > +#ifdef __ASSEMBLY__ > + > +#define PSHUFB_XMM5_XMM0 .byte 0x66, 0x0f, 0x38, 0x00, 0xc5 > +#define PSHUFB_XMM5_XMM6 .byte 0x66, 0x0f, 0x38, 0x00, 0xf5 > + > +#else > + > #include > #include > #include > @@ -411,4 +418,5 @@ static inline unsigned short get_fpu_mxcsr(struct task_struct *tsk) > } > } > > +#endif /* __ASSEMBLY__ */ > #endif /* _ASM_X86_I387_H */ Yeah. Or just a single block of: #ifndef __ASSEMBLY__ ... #endif /* __ASSEMBLY__ */ around the C bits - anything outside that is good for assembly as well. Ingo