Merge tag 'drm-fixes-2020-06-19' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / drivers / xen / cpu_hotplug.c

diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index ec975de..b96b11e 100644 (file)
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
@@ -93,10 +93,8 @@ static int setup_cpu_watcher(struct notifier_block *notifier,
        (void)register_xenbus_watch(&cpu_watch);
 
        for_each_possible_cpu(cpu) {
-               if (vcpu_online(cpu) == 0) {
-                       device_offline(get_cpu_device(cpu));
-                       set_cpu_present(cpu, false);
-               }
+               if (vcpu_online(cpu) == 0)
+                       disable_hotplug_cpu(cpu);
        }
 
        return NOTIFY_DONE;
@@ -119,5 +117,5 @@ static int __init setup_vcpu_hotplug_event(void)
        return 0;
 }
 
-arch_initcall(setup_vcpu_hotplug_event);
+late_initcall(setup_vcpu_hotplug_event);