Commit 3a5f65df authored by David Howells's avatar David Howells

Typedef SMP call function pointer

Typedef the pointer to the function to be called by smp_call_function() and
friends:

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

as it is used in a fair number of places.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: linux-arch@vger.kernel.org
parent 3b950de9
...@@ -13,9 +13,10 @@ ...@@ -13,9 +13,10 @@
extern void cpu_idle(void); extern void cpu_idle(void);
typedef void (*smp_call_func_t)(void *info);
struct call_single_data { struct call_single_data {
struct list_head list; struct list_head list;
void (*func) (void *info); smp_call_func_t func;
void *info; void *info;
u16 flags; u16 flags;
u16 priv; u16 priv;
...@@ -24,8 +25,8 @@ struct call_single_data { ...@@ -24,8 +25,8 @@ struct call_single_data {
/* total number of cpus in this system (may exceed NR_CPUS) */ /* total number of cpus in this system (may exceed NR_CPUS) */
extern unsigned int total_cpus; extern unsigned int total_cpus;
int smp_call_function_single(int cpuid, void (*func) (void *info), void *info, int smp_call_function_single(int cpuid, smp_call_func_t func, void *info,
int wait); int wait);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
...@@ -69,15 +70,15 @@ extern void smp_cpus_done(unsigned int max_cpus); ...@@ -69,15 +70,15 @@ extern void smp_cpus_done(unsigned int max_cpus);
/* /*
* Call a function on all other processors * Call a function on all other processors
*/ */
int smp_call_function(void(*func)(void *info), void *info, int wait); int smp_call_function(smp_call_func_t func, void *info, int wait);
void smp_call_function_many(const struct cpumask *mask, void smp_call_function_many(const struct cpumask *mask,
void (*func)(void *info), void *info, bool wait); smp_call_func_t func, void *info, bool wait);
void __smp_call_function_single(int cpuid, struct call_single_data *data, void __smp_call_function_single(int cpuid, struct call_single_data *data,
int wait); int wait);
int smp_call_function_any(const struct cpumask *mask, int smp_call_function_any(const struct cpumask *mask,
void (*func)(void *info), void *info, int wait); smp_call_func_t func, void *info, int wait);
/* /*
* Generic and arch helpers * Generic and arch helpers
...@@ -94,7 +95,7 @@ void ipi_call_unlock_irq(void); ...@@ -94,7 +95,7 @@ void ipi_call_unlock_irq(void);
/* /*
* Call a function on all processors * Call a function on all processors
*/ */
int on_each_cpu(void (*func) (void *info), void *info, int wait); int on_each_cpu(smp_call_func_t func, void *info, int wait);
#define MSG_ALL_BUT_SELF 0x8000 /* Assume <32768 CPU's */ #define MSG_ALL_BUT_SELF 0x8000 /* Assume <32768 CPU's */
#define MSG_ALL 0x8001 #define MSG_ALL 0x8001
...@@ -122,7 +123,7 @@ static inline void smp_send_stop(void) { } ...@@ -122,7 +123,7 @@ static inline void smp_send_stop(void) { }
* These macros fold the SMP functionality into a single CPU system * These macros fold the SMP functionality into a single CPU system
*/ */
#define raw_smp_processor_id() 0 #define raw_smp_processor_id() 0
static inline int up_smp_call_function(void (*func)(void *), void *info) static inline int up_smp_call_function(smp_call_func_t func, void *info)
{ {
return 0; return 0;
} }
...@@ -143,7 +144,7 @@ static inline void smp_send_reschedule(int cpu) { } ...@@ -143,7 +144,7 @@ static inline void smp_send_reschedule(int cpu) { }
static inline void init_call_single_data(void) { } static inline void init_call_single_data(void) { }
static inline int static inline int
smp_call_function_any(const struct cpumask *mask, void (*func)(void *info), smp_call_function_any(const struct cpumask *mask, smp_call_func_t func,
void *info, int wait) void *info, int wait)
{ {
return smp_call_function_single(0, func, info, wait); return smp_call_function_single(0, func, info, wait);
......
...@@ -267,7 +267,7 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_single_data, csd_data); ...@@ -267,7 +267,7 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct call_single_data, csd_data);
* *
* Returns 0 on success, else a negative status code. * Returns 0 on success, else a negative status code.
*/ */
int smp_call_function_single(int cpu, void (*func) (void *info), void *info, int smp_call_function_single(int cpu, smp_call_func_t func, void *info,
int wait) int wait)
{ {
struct call_single_data d = { struct call_single_data d = {
...@@ -336,7 +336,7 @@ EXPORT_SYMBOL(smp_call_function_single); ...@@ -336,7 +336,7 @@ EXPORT_SYMBOL(smp_call_function_single);
* 3) any other online cpu in @mask * 3) any other online cpu in @mask
*/ */
int smp_call_function_any(const struct cpumask *mask, int smp_call_function_any(const struct cpumask *mask,
void (*func)(void *info), void *info, int wait) smp_call_func_t func, void *info, int wait)
{ {
unsigned int cpu; unsigned int cpu;
const struct cpumask *nodemask; const struct cpumask *nodemask;
...@@ -416,7 +416,7 @@ void __smp_call_function_single(int cpu, struct call_single_data *data, ...@@ -416,7 +416,7 @@ void __smp_call_function_single(int cpu, struct call_single_data *data,
* must be disabled when calling this function. * must be disabled when calling this function.
*/ */
void smp_call_function_many(const struct cpumask *mask, void smp_call_function_many(const struct cpumask *mask,
void (*func)(void *), void *info, bool wait) smp_call_func_t func, void *info, bool wait)
{ {
struct call_function_data *data; struct call_function_data *data;
unsigned long flags; unsigned long flags;
...@@ -500,7 +500,7 @@ EXPORT_SYMBOL(smp_call_function_many); ...@@ -500,7 +500,7 @@ EXPORT_SYMBOL(smp_call_function_many);
* You must not call this function with disabled interrupts or from a * You must not call this function with disabled interrupts or from a
* hardware interrupt handler or from a bottom half handler. * hardware interrupt handler or from a bottom half handler.
*/ */
int smp_call_function(void (*func)(void *), void *info, int wait) int smp_call_function(smp_call_func_t func, void *info, int wait)
{ {
preempt_disable(); preempt_disable();
smp_call_function_many(cpu_online_mask, func, info, wait); smp_call_function_many(cpu_online_mask, func, info, wait);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment