hold lock_device_hotplug throughout hotplug ops

---
 drivers/xen/cpu_hotplug.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index 5676aef..ce626a5 100644
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
@@ -10,23 +10,24 @@

 static void enable_hotplug_cpu(int cpu)
 {
+       lock_device_hotplug();
        if (!cpu_present(cpu))
                xen_arch_register_cpu(cpu);

        set_cpu_present(cpu, true);
+       unlock_device_hotplug();
 }

 static void disable_hotplug_cpu(int cpu)
 {
-       if (cpu_online(cpu)) {
-               lock_device_hotplug();
+       lock_device_hotplug();
+       if (cpu_online(cpu))
                device_offline(get_cpu_device(cpu));
-               unlock_device_hotplug();
-       }
        if (cpu_present(cpu))
                xen_arch_unregister_cpu(cpu);

        set_cpu_present(cpu, false);
+       unlock_device_hotplug();
 }