diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-19 12:30:33 +0100 |
| commit | d9227958dc0e56976eaf452a213aee8415a9eb60 (patch) | |
| tree | 1f31cfd333fce67c76e2693c4d55caac39744bee /drivers/crypto/padlock-aes.c | |
| parent | b0c2d653f718f3d56b4ffdca950aea247ee7dc99 (diff) | |
| parent | 0bd2bedb3501db249b347e5acbfd3415bd7667a5 (diff) | |
Merge tag 'v4.4.138' into linux-linaro-lsk-v4.4lsk-v4.4-18.06
This is the 4.4.138 stable release
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; } |