diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-16 17:30:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-16 17:30:11 +0200 |
| commit | ec57e2f0acb01710cd465bc04495ed03a9e0fea1 (patch) | |
| tree | 9f45889ba31b750f99fd3d0b625684d9b4cd4f17 /arch/x86/crypto/morus1280-sse2-glue.c | |
| parent | locking/lockdep: Remove duplicated 'lock_class_ops' percpu array (diff) | |
| parent | x86/defconfig: Enable CONFIG_USB_XHCI_HCD=y (diff) | |
| download | linux-ec57e2f0acb01710cd465bc04495ed03a9e0fea1.tar.xz linux-ec57e2f0acb01710cd465bc04495ed03a9e0fea1.zip | |
Merge branch 'x86/build' into locking/core, to pick up dependent patches and unify jump-label work
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/crypto/morus1280-sse2-glue.c')
| -rw-r--r-- | arch/x86/crypto/morus1280-sse2-glue.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/crypto/morus1280-sse2-glue.c b/arch/x86/crypto/morus1280-sse2-glue.c index 95cf857d2cbb..f40244eaf14d 100644 --- a/arch/x86/crypto/morus1280-sse2-glue.c +++ b/arch/x86/crypto/morus1280-sse2-glue.c @@ -40,7 +40,6 @@ MORUS1280_DECLARE_ALGS(sse2, "morus1280-sse2", 350); static int __init crypto_morus1280_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; |