Commit 5671d814 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner
Browse files

smp: Use smp_cond_func_t as type for the conditional function 



Use a typdef for the conditional function instead defining it each time in
the function prototype.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20200117090137.1205765-2-bigeasy@linutronix.de
parent def9d278

include/linux/smp.h

+6 −6
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/llist.h>



typedef void (*smp_call_func_t)(void *info);

typedef bool (*smp_cond_func_t)(int cpu, void *info);

struct __call_single_data {

	struct llist_node llist;

	smp_call_func_t func;
@@ -49,13 +50,12 @@ void on_each_cpu_mask(const struct cpumask *mask, smp_call_func_t func, 
 * cond_func returns a positive value. This may include the local

 * processor.

 */

void on_each_cpu_cond(bool (*cond_func)(int cpu, void *info),

		smp_call_func_t func, void *info, bool wait,

		gfp_t gfp_flags);

void on_each_cpu_cond(smp_cond_func_t cond_func, smp_call_func_t func,

		      void *info, bool wait, gfp_t gfp_flags);



void on_each_cpu_cond_mask(bool (*cond_func)(int cpu, void *info),

		smp_call_func_t func, void *info, bool wait,

		gfp_t gfp_flags, const struct cpumask *mask);

void on_each_cpu_cond_mask(smp_cond_func_t cond_func, smp_call_func_t func,

			   void *info, bool wait, gfp_t gfp_flags,

			   const struct cpumask *mask);



int smp_call_function_single_async(int cpu, call_single_data_t *csd);

kernel/smp.c

+5 −6
Original line number Diff line number Diff line
@@ -680,9 +680,9 @@ EXPORT_SYMBOL(on_each_cpu_mask); 
 * You must not call this function with disabled interrupts or

 * from a hardware interrupt handler or from a bottom half handler.

 */

void on_each_cpu_cond_mask(bool (*cond_func)(int cpu, void *info),

			smp_call_func_t func, void *info, bool wait,

			gfp_t gfp_flags, const struct cpumask *mask)

void on_each_cpu_cond_mask(smp_cond_func_t cond_func, smp_call_func_t func,

			   void *info, bool wait, gfp_t gfp_flags,

			   const struct cpumask *mask)

{

	cpumask_var_t cpus;

	int cpu, ret;
@@ -714,9 +714,8 @@ void on_each_cpu_cond_mask(bool (*cond_func)(int cpu, void *info), 
}

EXPORT_SYMBOL(on_each_cpu_cond_mask);



void on_each_cpu_cond(bool (*cond_func)(int cpu, void *info),

			smp_call_func_t func, void *info, bool wait,

			gfp_t gfp_flags)

void on_each_cpu_cond(smp_cond_func_t cond_func, smp_call_func_t func,

		      void *info, bool wait, gfp_t gfp_flags)

{

	on_each_cpu_cond_mask(cond_func, func, info, wait, gfp_flags,

				cpu_online_mask);

kernel/up.c

+5 −6
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ EXPORT_SYMBOL(on_each_cpu_mask); 
 * Preemption is disabled here to make sure the cond_func is called under the

 * same condtions in UP and SMP.

 */

void on_each_cpu_cond_mask(bool (*cond_func)(int cpu, void *info),

			   smp_call_func_t func, void *info, bool wait,

			   gfp_t gfp_flags, const struct cpumask *mask)

void on_each_cpu_cond_mask(smp_cond_func_t cond_func, smp_call_func_t func,

			   void *info, bool wait, gfp_t gfp_flags,

			   const struct cpumask *mask)

{

	unsigned long flags;
@@ -84,9 +84,8 @@ void on_each_cpu_cond_mask(bool (*cond_func)(int cpu, void *info), 
}

EXPORT_SYMBOL(on_each_cpu_cond_mask);



void on_each_cpu_cond(bool (*cond_func)(int cpu, void *info),

		      smp_call_func_t func, void *info, bool wait,

		      gfp_t gfp_flags)

void on_each_cpu_cond(smp_cond_func_t cond_func, smp_call_func_t func,

		      void *info, bool wait, gfp_t gfp_flags)

{

	on_each_cpu_cond_mask(cond_func, func, info, wait, gfp_flags, NULL);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE