Merge branch 'linus' into sched/core, to resolve conflict

Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index f0b9871a4bbd..3ba611419759 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -1158,11 +1158,12 @@ static ssize_t poll_timeout_store(struct bus_type *bus, const char *buf,
         poll_timeout = time;
         hr_time = ktime_set(0, poll_timeout);
 
-        if (!hrtimer_is_queued(&ap_poll_timer) ||
-            !hrtimer_forward(&ap_poll_timer, hrtimer_get_expires(&ap_poll_timer), hr_time)) {
-                hrtimer_set_expires(&ap_poll_timer, hr_time);
-                hrtimer_start_expires(&ap_poll_timer, HRTIMER_MODE_ABS);
-        }
+        spin_lock_bh(&ap_poll_timer_lock);
+        hrtimer_cancel(&ap_poll_timer);
+        hrtimer_set_expires(&ap_poll_timer, hr_time);
+        hrtimer_start_expires(&ap_poll_timer, HRTIMER_MODE_ABS);
+        spin_unlock_bh(&ap_poll_timer_lock);
+
         return count;
 }
 
@@ -1528,14 +1529,11 @@ static inline void __ap_schedule_poll_timer(void)
         ktime_t hr_time;
 
         spin_lock_bh(&ap_poll_timer_lock);
-        if (hrtimer_is_queued(&ap_poll_timer) || ap_suspend_flag)
-                goto out;
-        if (ktime_to_ns(hrtimer_expires_remaining(&ap_poll_timer)) <= 0) {
+        if (!hrtimer_is_queued(&ap_poll_timer) && !ap_suspend_flag) {
                 hr_time = ktime_set(0, poll_timeout);
                 hrtimer_forward_now(&ap_poll_timer, hr_time);
                 hrtimer_restart(&ap_poll_timer);
         }
-out:
         spin_unlock_bh(&ap_poll_timer_lock);
 }
 
@@ -1952,7 +1950,7 @@ static void ap_reset_domain(void)
 {
         int i;
 
-        if (ap_domain_index != -1)
+        if ((ap_domain_index != -1) && (ap_test_config_domain(ap_domain_index)))
                 for (i = 0; i < AP_DEVICES; i++)
                         ap_reset_queue(AP_MKQID(i, ap_domain_index));
 }
@@ -2097,7 +2095,6 @@ void ap_module_exit(void)
         hrtimer_cancel(&ap_poll_timer);
         destroy_workqueue(ap_work_queue);
         tasklet_kill(&ap_tasklet);
-        root_device_unregister(ap_root_device);
         while ((dev = bus_find_device(&ap_bus_type, NULL, NULL,
                     __ap_match_all)))
         {
@@ -2106,6 +2103,7 @@ void ap_module_exit(void)
         }
         for (i = 0; ap_bus_attrs[i]; i++)
                 bus_remove_file(&ap_bus_type, ap_bus_attrs[i]);
+        root_device_unregister(ap_root_device);
         bus_unregister(&ap_bus_type);
         unregister_reset_call(&ap_reset_call);
         if (ap_using_interrupts())