|
@@ -318,12 +318,13 @@ bool stop_one_cpu_nowait(unsigned int cpu, cpu_stop_fn_t fn, void *arg,
|
|
/* static data for stop_cpus */
|
|
/* static data for stop_cpus */
|
|
static DEFINE_MUTEX(stop_cpus_mutex);
|
|
static DEFINE_MUTEX(stop_cpus_mutex);
|
|
|
|
|
|
-static void queue_stop_cpus_work(const struct cpumask *cpumask,
|
|
|
|
|
|
+static bool queue_stop_cpus_work(const struct cpumask *cpumask,
|
|
cpu_stop_fn_t fn, void *arg,
|
|
cpu_stop_fn_t fn, void *arg,
|
|
struct cpu_stop_done *done)
|
|
struct cpu_stop_done *done)
|
|
{
|
|
{
|
|
struct cpu_stop_work *work;
|
|
struct cpu_stop_work *work;
|
|
unsigned int cpu;
|
|
unsigned int cpu;
|
|
|
|
+ bool queued = false;
|
|
|
|
|
|
/*
|
|
/*
|
|
* Disable preemption while queueing to avoid getting
|
|
* Disable preemption while queueing to avoid getting
|
|
@@ -336,9 +337,12 @@ static void queue_stop_cpus_work(const struct cpumask *cpumask,
|
|
work->fn = fn;
|
|
work->fn = fn;
|
|
work->arg = arg;
|
|
work->arg = arg;
|
|
work->done = done;
|
|
work->done = done;
|
|
- cpu_stop_queue_work(cpu, work);
|
|
|
|
|
|
+ if (cpu_stop_queue_work(cpu, work))
|
|
|
|
+ queued = true;
|
|
}
|
|
}
|
|
lg_global_unlock(&stop_cpus_lock);
|
|
lg_global_unlock(&stop_cpus_lock);
|
|
|
|
+
|
|
|
|
+ return queued;
|
|
}
|
|
}
|
|
|
|
|
|
static int __stop_cpus(const struct cpumask *cpumask,
|
|
static int __stop_cpus(const struct cpumask *cpumask,
|
|
@@ -347,9 +351,11 @@ static int __stop_cpus(const struct cpumask *cpumask,
|
|
struct cpu_stop_done done;
|
|
struct cpu_stop_done done;
|
|
|
|
|
|
cpu_stop_init_done(&done, cpumask_weight(cpumask));
|
|
cpu_stop_init_done(&done, cpumask_weight(cpumask));
|
|
- queue_stop_cpus_work(cpumask, fn, arg, &done);
|
|
|
|
|
|
+ if (!queue_stop_cpus_work(cpumask, fn, arg, &done))
|
|
|
|
+ return -ENOENT;
|
|
wait_for_completion(&done.completion);
|
|
wait_for_completion(&done.completion);
|
|
- return done.executed ? done.ret : -ENOENT;
|
|
|
|
|
|
+ WARN_ON(!done.executed);
|
|
|
|
+ return done.ret;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|