diff options
author | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:42 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:42 +0100 |
commit | 0c3334d02d93988c106340d85b641e23b9087abb (patch) | |
tree | e96abc7617cfc2125be89ca765e86cdd9a1f06cd /drivers/crypto/padlock-aes.c | |
parent | 09e05e96cbb3e437b919a99b29ed0e59db9724cb (diff) | |
parent | d9227958dc0e56976eaf452a213aee8415a9eb60 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-18.06-rt
Diffstat (limited to 'drivers/crypto/padlock-aes.c')
-rw-r--r-- | drivers/crypto/padlock-aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index da2d6777bd09..97a364694bfc 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c @@ -515,7 +515,7 @@ static int __init padlock_init(void) if (!x86_match_cpu(padlock_cpu_id)) return -ENODEV; - if (!cpu_has_xcrypt_enabled) { + if (!boot_cpu_has(X86_FEATURE_XCRYPT_EN)) { printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n"); return -ENODEV; } |