xen: Clean up SMP/hotplug headers and implementation a bit.

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

1 files changed, 5 insertions, 15 deletions

diff --git a/xen/common/stop_machine.c b/xen/common/stop_machine.c
index b109167ef7..1411b9f197 100644
--- a/xen/common/stop_machine.c
+++ b/xen/common/stop_machine.c
@@ -22,12 +22,13 @@
 
 #include <xen/config.h>
 #include <xen/init.h>
+#include <xen/sched.h>
 #include <xen/spinlock.h>
-#include <asm/smp.h>
-#include <asm/current.h>
 #include <xen/softirq.h>
-#include <asm/processor.h>
 #include <xen/errno.h>
+#include <xen/smp.h>
+#include <asm/current.h>
+#include <asm/processor.h>
 
 enum stopmachine_state {
     STOPMACHINE_START,
@@ -61,7 +62,7 @@ static void stopmachine_set_state(enum stopmachine_state state)
         cpu_relax();
 }
 
-int __stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
+int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
 {
     cpumask_t allbutself;
     unsigned int i, nr_cpus;
@@ -116,17 +117,6 @@ int __stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
     return ret;
 }
 
-int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
-{
-    int ret;
-
-    lock_cpu_hotplug();
-    ret = __stop_machine_run(fn, data, cpu);
-    unlock_cpu_hotplug();
-
-    return ret;
-}
-
 static void stopmachine_softirq(void)
 {
     enum stopmachine_state state = STOPMACHINE_START;