Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a301f22 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Ingo Molnar
Browse files

stop_machine: Use 'cpu_stop_fn_t' where possible 



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: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@kernel.org>
parent 7eeb088e

include/linux/stop_machine.h

+4 −4
Original line number Diff line number Diff line
@@ -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

 * 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);

#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)

{

	unsigned long flags;
@@ -129,7 +129,7 @@ static inline int stop_machine(int (*fn)(void *), void *data, 
	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)

{

	return stop_machine(fn, data, cpus);

kernel/stop_machine.c

+4 −4
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ enum multi_stop_state { 
};



struct multi_stop_data {

	int			(*fn)(void *);

	cpu_stop_fn_t		fn;

	void			*data;

	/* Like num_online_cpus(), but hotplug cpu uses us, so we need this. */

	unsigned int		num_threads;
@@ -513,7 +513,7 @@ early_initcall(cpu_stop_init); 


#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 = {

		.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);

}



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;
@@ -580,7 +580,7 @@ EXPORT_SYMBOL_GPL(stop_machine); 
 * 0 if all executions of @fn returned 0, any non zero return value if any

 * 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)

{

	struct multi_stop_data msdata = { .fn = fn, .data = data,