From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ben Hutchings <ben@decadent.org.uk>,
Dave Hansen <dave.hansen@linux.intel.com>
Subject: Re: linux-next: manual merge of the tip tree with the crypto-current tree
Date: Fri, 9 Oct 2015 13:09:34 +1100 [thread overview]
Message-ID: <20151009130934.1affe26a@canb.auug.org.au> (raw)
In-Reply-To: <20151009124700.46d8cf61@canb.auug.org.au>
Hi all,
On Fri, 9 Oct 2015 12:47:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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
prev parent reply other threads:[~2015-10-09 2:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-09 1:47 linux-next: manual merge of the tip tree with the crypto-current tree Stephen Rothwell
2015-10-09 1:52 ` Ben Hutchings
2015-10-09 2:09 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151009130934.1affe26a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ben@decadent.org.uk \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox