Messages in this thread | | | Date | Fri, 9 Oct 2015 13:09:34 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the tip tree with the crypto-current tree |
| |
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
| |