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, 6 insertions, 0 deletions

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 9cb3dfbcaddb..61f768518a34 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -74,6 +74,7 @@ static struct device *ap_root_device = NULL;
 static struct ap_config_info *ap_configuration;
 static DEFINE_SPINLOCK(ap_device_list_lock);
 static LIST_HEAD(ap_device_list);
+static bool initialised;
 
 /*
  * Workqueue timer for bus rescan.
@@ -1384,6 +1385,9 @@ int ap_driver_register(struct ap_driver *ap_drv, struct module *owner,
 {
         struct device_driver *drv = &ap_drv->driver;
 
+        if (!initialised)
+                return -ENODEV;
+
         drv->bus = &ap_bus_type;
         drv->probe = ap_device_probe;
         drv->remove = ap_device_remove;
@@ -1808,6 +1812,7 @@ int __init ap_module_init(void)
                 goto out_pm;
 
         queue_work(system_long_wq, &ap_scan_work);
+        initialised = true;
 
         return 0;
 
@@ -1837,6 +1842,7 @@ void ap_module_exit(void)
 {
         int i;
 
+        initialised = false;
         ap_reset_domain();
         ap_poll_thread_stop();
         del_timer_sync(&ap_config_timer);