Move cpu hotplug routines into common cpu.c file.

Also simplify the locking (reverting to use if spin_trylock, as
returning EBUSY/EAGAIN seems unavoidable after all). In particular
this should continue to ensure that stop_machine_run() does not have
cpu_online_map change under its feet.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h
index e1f500c4ec..f6f737d756 100644
--- a/xen/include/xen/spinlock.h
+++ b/xen/include/xen/spinlock.h
@@ -146,6 +146,7 @@ int _spin_trylock(spinlock_t *lock);
 void _spin_barrier(spinlock_t *lock);
 void _spin_barrier_irq(spinlock_t *lock);
 
+int _spin_trylock_recursive(spinlock_t *lock);
 void _spin_lock_recursive(spinlock_t *lock);
 void _spin_unlock_recursive(spinlock_t *lock);
 
@@ -191,6 +192,7 @@ int _rw_is_write_locked(rwlock_t *lock);
  * are any critical regions that cannot form part of such a set, they can use
  * standard spin_[un]lock().
  */
+#define spin_trylock_recursive(l)     _spin_trylock_recursive(l)
 #define spin_lock_recursive(l)        _spin_lock_recursive(l)
 #define spin_unlock_recursive(l)      _spin_unlock_recursive(l)