From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756270AbbJICJh (ORCPT ); Thu, 8 Oct 2015 22:09:37 -0400 Received: from ozlabs.org ([103.22.144.67]:44511 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753657AbbJICJg (ORCPT ); Thu, 8 Oct 2015 22:09:36 -0400 Date: Fri, 9 Oct 2015 13:09:34 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Hutchings , Dave Hansen Subject: Re: linux-next: manual merge of the tip tree with the crypto-current tree Message-ID: <20151009130934.1affe26a@canb.auug.org.au> In-Reply-To: <20151009124700.46d8cf61@canb.auug.org.au> References: <20151009124700.46d8cf61@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, On Fri, 9 Oct 2015 12:47:00 +1100 Stephen Rothwell wrote: > > diff --cc arch/x86/crypto/camellia_aesni_avx_glue.c > index bacaa13acac5,12e729bfe71b..000000000000 > --- a/arch/x86/crypto/camellia_aesni_avx_glue.c > +++ b/arch/x86/crypto/camellia_aesni_avx_glue.c > @@@ -554,12 -554,8 +554,14 @@@ static int __init camellia_aesni_init(v > { > const char *feature_name; > > + if (!cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) { > + pr_info("AVX or AES-NI instructions are not detected.\n"); > + return -ENODEV; > + } > + > + if (!cpu_has_xfeatures(XSTATE_SSE | XSTATE_YMM, &feature_name)) { OOPS, I clearly meant to remove that line as well (which I have now done). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au