diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2018-09-21 13:22:37 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-09-21 13:22:37 +0800 |
| commit | 910e3ca10bba726d10a865b279d98bf8fbf12cf4 (patch) | |
| tree | f4e35157bdb5f47ce7d31e99caa8dd3536ce4366 /arch/x86/crypto/morus640-sse2-glue.c | |
| parent | crypto: cavium/nitrox - Added support for SR-IOV configuration. (diff) | |
| parent | crypto: caam/jr - fix ablkcipher_edesc pointer arithmetic (diff) | |
| download | linux-dev-910e3ca10bba726d10a865b279d98bf8fbf12cf4.tar.xz linux-dev-910e3ca10bba726d10a865b279d98bf8fbf12cf4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge crypto-2.6 to resolve caam conflict with skcipher conversion.
Diffstat (limited to 'arch/x86/crypto/morus640-sse2-glue.c')
| -rw-r--r-- | arch/x86/crypto/morus640-sse2-glue.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/crypto/morus640-sse2-glue.c b/arch/x86/crypto/morus640-sse2-glue.c index 615fb7bc9a32..9afaf8f8565a 100644 --- a/arch/x86/crypto/morus640-sse2-glue.c +++ b/arch/x86/crypto/morus640-sse2-glue.c @@ -40,7 +40,6 @@ MORUS640_DECLARE_ALGS(sse2, "morus640-sse2", 400); static int __init crypto_morus640_sse2_module_init(void) { if (!boot_cpu_has(X86_FEATURE_XMM2) || - !boot_cpu_has(X86_FEATURE_OSXSAVE) || !cpu_has_xfeatures(XFEATURE_MASK_SSE, NULL)) return -ENODEV; |