Merge tag 'kvm-arm-for-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/ARM Fixes for v4.4-rc3.

Includes some timer fixes, properly unmapping PTEs, an errata fix, and two
tweaks to the EL2 panic code.

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
index a9603ebbc1f8..9f8fa42c062c 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
@@ -317,11 +317,9 @@ EXPORT_SYMBOL(zcrypt_device_unregister);
 
 void zcrypt_msgtype_register(struct zcrypt_ops *zops)
 {
-        if (zops->owner) {
-                spin_lock_bh(&zcrypt_ops_list_lock);
-                list_add_tail(&zops->list, &zcrypt_ops_list);
-                spin_unlock_bh(&zcrypt_ops_list_lock);
-        }
+        spin_lock_bh(&zcrypt_ops_list_lock);
+        list_add_tail(&zops->list, &zcrypt_ops_list);
+        spin_unlock_bh(&zcrypt_ops_list_lock);
 }
 EXPORT_SYMBOL(zcrypt_msgtype_register);
 
@@ -342,7 +340,7 @@ struct zcrypt_ops *__ops_lookup(unsigned char *name, int variant)
         spin_lock_bh(&zcrypt_ops_list_lock);
         list_for_each_entry(zops, &zcrypt_ops_list, list) {
                 if ((zops->variant == variant) &&
-                    (!strncmp(zops->owner->name, name, MODULE_NAME_LEN))) {
+                    (!strncmp(zops->name, name, sizeof(zops->name)))) {
                         found = 1;
                         break;
                 }