diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-06-29 12:04:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-06-29 12:04:17 -0700 |
| commit | 25c69bf35b1a493ab8c8aca28afd9bb9d0d5d26c (patch) | |
| tree | b186b8c104e3e94d06dc31d8305c47d6a8995194 /drivers/crypto/padlock-sha.c | |
| parent | ae8a7e6903c2a6201226b3aabb0d7673c6a5f042 (diff) | |
| parent | 563a330876f64f5289d0886857947c7bd469f907 (diff) | |
Merge "Merge android-4.4.138 (07c0138) into msm-4.4"
Diffstat (limited to 'drivers/crypto/padlock-sha.c')
| -rw-r--r-- | drivers/crypto/padlock-sha.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c index 4e154c9b9206..8c5f90647b7a 100644 --- a/drivers/crypto/padlock-sha.c +++ b/drivers/crypto/padlock-sha.c @@ -540,7 +540,7 @@ static int __init padlock_init(void) struct shash_alg *sha1; struct shash_alg *sha256; - if (!x86_match_cpu(padlock_sha_ids) || !cpu_has_phe_enabled) + if (!x86_match_cpu(padlock_sha_ids) || !boot_cpu_has(X86_FEATURE_PHE_EN)) return -ENODEV; /* Register the newly added algorithm module if on * |