Remove deprecated stop_machine_run: fix Xen
PATCH 1/2 Remove deprecated stop_machine_run: fix Xen
This is the last use of (the deprecated) stop_machine_run in the tree.
Signed-off-by Rusty Russell <[email protected]>
--- drivers/xen/manage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/xen/manage.c +1 -1
@@ -102,7 +102,7 @@ static void do_suspend(void)/* XXX use normal device tree? */ xenbus_suspend (); - err =stop_machine_run (xen_suspend, &cancelled,0 ); + err =stop_machine (xen_suspend, &cancelled, &cpumask_of_cpu (0 ));if (err) {printk (KERN_ERR "failed to start xen_suspend: %d\n" , err); goto out;
PATCH 2/2 Remove deprecated stop_machine_run
Everyone should be using stop_machine() now. The staged API transition helped life in linux-next.
Signed-off-by Rusty Russell <[email protected]>
--- include/linux/stop_machine.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
include/linux/stop_machine.h +1 -18
@@ -3,15 +3,12 @@/* "Bogolock": stop the entire machine, disable interrupts. This is a very heavy lock, which is equivalent to grabbing every spinlock (and more). So the "read" side to such a lock is anything which -diables preeempt. */ +disables preeempt. */ #include <linux/cpu.h> #include <linux/cpumask.h> #include <asm/system.h> #if defined(CONFIG_STOP_MACHINE ) && defined(CONFIG_SMP ) - -/* Deprecated, but useful for transition. */ -#define ALL_CPUS ~0U/** * stop_machine: freeze the machine on all CPUs and run this function
@@ -50,18 +47,4 @@ static inline int stop_machine(int (*fn)return ret; }#endif /* CONFIG_SMP */ - -static inline int __deprecated stop_machine_run (int (*fn)(void *),void *data, -unsigned int cpu) -{ -/* If they don't care which cpu fn runs on, just pick one. */ -if (cpu ==NR_CPUS ) -return stop_machine (fn, data,NULL ); -else if (cpu == ~0U ) -return stop_machine (fn, data, &cpu_possible_map); -else { -cpumask_t cpus =cpumask_of_cpu (cpu); -return stop_machine (fn, data, &cpus); - } -}#endif /* _LINUX_STOP_MACHINE */