diff options
| author | Borislav Petkov <[email protected]> | 2016-04-04 22:24:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2016-04-13 11:37:39 +0200 |
| commit | 1f4dd7938ea575a2d1972e180eaef31e6edb1808 (patch) | |
| tree | 456c81bf94b794a520786a724164b6c7f62a516a /arch/x86/crypto/camellia_aesni_avx_glue.c | |
| parent | abcfdfe07de75f830cbec1aa3eb17833a0166697 (diff) | |
x86/cpufeature: Replace cpu_has_aes with boot_cpu_has() usage
Signed-off-by: Borislav Petkov <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'arch/x86/crypto/camellia_aesni_avx_glue.c')
| -rw-r--r-- | arch/x86/crypto/camellia_aesni_avx_glue.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/crypto/camellia_aesni_avx_glue.c b/arch/x86/crypto/camellia_aesni_avx_glue.c index 65f64556725b..6d256d59c5fd 100644 --- a/arch/x86/crypto/camellia_aesni_avx_glue.c +++ b/arch/x86/crypto/camellia_aesni_avx_glue.c @@ -554,7 +554,9 @@ static int __init camellia_aesni_init(void) { const char *feature_name; - if (!cpu_has_avx || !cpu_has_aes || !boot_cpu_has(X86_FEATURE_OSXSAVE)) { + if (!cpu_has_avx || + !boot_cpu_has(X86_FEATURE_AES) || + !boot_cpu_has(X86_FEATURE_OSXSAVE)) { pr_info("AVX or AES-NI instructions are not detected.\n"); return -ENODEV; } |