AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

stop_machine: Use 'cpu_stop_fn_t' where possible

Browse Source 
Cosmetic, but 'cpu_stop_fn_t' actually makes the code more readable and
it doesn't break cscope. And most of the declarations already use it.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: dave@stgolabs.net
Cc: der.herr@hofr.at
Cc: paulmck@linux.vnet.ibm.com
Cc: riel@redhat.com
Cc: viro@ZenIV.linux.org.uk
Link: http://lkml.kernel.org/r/20150630012955.GA23937@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Oleg Nesterov 2015-06-30 03:29:55 +02:00 committed by Ingo Molnar
parent 7eeb088e72
commit 9a301f22fa
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/stop_machine.h
View File

@ -112,13 +112,13 @@ static inline int try_stop_cpus(const struct cpumask *cpumask,
* *
* This can be thought of as a very heavy write lock, equivalent to * This can be thought of as a very heavy write lock, equivalent to
* grabbing every spinlock in the kernel. */ * grabbing every spinlock in the kernel. */
int stop_machine(int (*fn)(void *), void *data, const struct cpumask *cpus); int stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus);
int stop_machine_from_inactive_cpu(int (*fn)(void *), void *data, int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
const struct cpumask *cpus); const struct cpumask *cpus);
#else /* CONFIG_STOP_MACHINE && CONFIG_SMP */ #else /* CONFIG_STOP_MACHINE && CONFIG_SMP */
static inline int stop_machine(int (*fn)(void *), void *data, static inline int stop_machine(cpu_stop_fn_t fn, void *data,
const struct cpumask *cpus) const struct cpumask *cpus)
{ {
unsigned long flags; unsigned long flags;
@ -129,7 +129,7 @@ static inline int stop_machine(int (*fn)(void *), void *data,
return ret; return ret;
} }
static inline int stop_machine_from_inactive_cpu(int (*fn)(void *), void *data, static inline int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
const struct cpumask *cpus) const struct cpumask *cpus)
{ {
return stop_machine(fn, data, cpus); return stop_machine(fn, data, cpus);

8
kernel/stop_machine.c
View File

@ -141,7 +141,7 @@ enum multi_stop_state {
}; };
struct multi_stop_data { struct multi_stop_data {
int (*fn)(void *); cpu_stop_fn_t fn;
void *data; void *data;
/* Like num_online_cpus(), but hotplug cpu uses us, so we need this. */ /* Like num_online_cpus(), but hotplug cpu uses us, so we need this. */
unsigned int num_threads; unsigned int num_threads;
@ -513,7 +513,7 @@ early_initcall(cpu_stop_init);
#ifdef CONFIG_STOP_MACHINE #ifdef CONFIG_STOP_MACHINE
static int __stop_machine(int (*fn)(void *), void *data, const struct cpumask *cpus) static int __stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus)
{ {
struct multi_stop_data msdata = { struct multi_stop_data msdata = {
.fn = fn, .fn = fn,
@ -546,7 +546,7 @@ static int __stop_machine(int (*fn)(void *), void *data, const struct cpumask *c
return stop_cpus(cpu_online_mask, multi_cpu_stop, &msdata); return stop_cpus(cpu_online_mask, multi_cpu_stop, &msdata);
} }
int stop_machine(int (*fn)(void *), void *data, const struct cpumask *cpus) int stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus)
{ {
int ret; int ret;
@ -580,7 +580,7 @@ EXPORT_SYMBOL_GPL(stop_machine);
* 0 if all executions of @fn returned 0, any non zero return value if any * 0 if all executions of @fn returned 0, any non zero return value if any
* returned non zero. * returned non zero.
*/ */
int stop_machine_from_inactive_cpu(int (*fn)(void *), void *data, int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
const struct cpumask *cpus) const struct cpumask *cpus)
{ {
struct multi_stop_data msdata = { .fn = fn, .data = data, struct multi_stop_data msdata = { .fn = fn, .data = data,