diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2009-09-24 11:34:46 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-09-23 20:04:47 -0400 |
commit | 0748bd01773395003208996c4c0b3f80caf80976 (patch) | |
tree | 99abf2a49d66c4890f4cc6b114bfd47684bab68e | |
parent | 630cd0460724e286d3c5cb2c33930b0ae9cd6645 (diff) |
cpumask: remove arch_send_call_function_ipi
Now everyone is converted to arch_send_call_function_ipi_mask, remove
the shim and the #defines.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r-- | arch/alpha/include/asm/smp.h | 1 | ||||
-rw-r--r-- | arch/arm/include/asm/smp.h | 1 | ||||
-rw-r--r-- | arch/ia64/include/asm/smp.h | 1 | ||||
-rw-r--r-- | arch/m32r/include/asm/smp.h | 1 | ||||
-rw-r--r-- | arch/mips/include/asm/smp.h | 1 | ||||
-rw-r--r-- | arch/parisc/include/asm/smp.h | 1 | ||||
-rw-r--r-- | arch/powerpc/include/asm/smp.h | 1 | ||||
-rw-r--r-- | arch/s390/include/asm/smp.h | 1 | ||||
-rw-r--r-- | arch/sh/include/asm/smp.h | 1 | ||||
-rw-r--r-- | arch/sparc/include/asm/smp_64.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/smp.h | 1 | ||||
-rw-r--r-- | kernel/smp.c | 7 |
12 files changed, 0 insertions, 18 deletions
diff --git a/arch/alpha/include/asm/smp.h b/arch/alpha/include/asm/smp.h index 8818a1bcdc8b..3f390e8cc0b3 100644 --- a/arch/alpha/include/asm/smp.h +++ b/arch/alpha/include/asm/smp.h | |||
@@ -48,7 +48,6 @@ extern int smp_num_cpus; | |||
48 | 48 | ||
49 | extern void arch_send_call_function_single_ipi(int cpu); | 49 | extern void arch_send_call_function_single_ipi(int cpu); |
50 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 50 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
51 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
52 | 51 | ||
53 | #else /* CONFIG_SMP */ | 52 | #else /* CONFIG_SMP */ |
54 | 53 | ||
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h index a06e735b262a..e0d763be1846 100644 --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h | |||
@@ -93,7 +93,6 @@ extern void platform_cpu_enable(unsigned int cpu); | |||
93 | 93 | ||
94 | extern void arch_send_call_function_single_ipi(int cpu); | 94 | extern void arch_send_call_function_single_ipi(int cpu); |
95 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 95 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
96 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
97 | 96 | ||
98 | /* | 97 | /* |
99 | * show local interrupt info | 98 | * show local interrupt info |
diff --git a/arch/ia64/include/asm/smp.h b/arch/ia64/include/asm/smp.h index d217d1d4e051..0b3b3997decd 100644 --- a/arch/ia64/include/asm/smp.h +++ b/arch/ia64/include/asm/smp.h | |||
@@ -127,7 +127,6 @@ extern int is_multithreading_enabled(void); | |||
127 | 127 | ||
128 | extern void arch_send_call_function_single_ipi(int cpu); | 128 | extern void arch_send_call_function_single_ipi(int cpu); |
129 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 129 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
130 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
131 | 130 | ||
132 | #else /* CONFIG_SMP */ | 131 | #else /* CONFIG_SMP */ |
133 | 132 | ||
diff --git a/arch/m32r/include/asm/smp.h b/arch/m32r/include/asm/smp.h index c2be49d408a3..e67ded1aab91 100644 --- a/arch/m32r/include/asm/smp.h +++ b/arch/m32r/include/asm/smp.h | |||
@@ -89,7 +89,6 @@ extern unsigned long send_IPI_mask_phys(cpumask_t, int, int); | |||
89 | 89 | ||
90 | extern void arch_send_call_function_single_ipi(int cpu); | 90 | extern void arch_send_call_function_single_ipi(int cpu); |
91 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 91 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
92 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
93 | 92 | ||
94 | #endif /* not __ASSEMBLY__ */ | 93 | #endif /* not __ASSEMBLY__ */ |
95 | 94 | ||
diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h index 48c1967961ad..e15f11a09311 100644 --- a/arch/mips/include/asm/smp.h +++ b/arch/mips/include/asm/smp.h | |||
@@ -79,6 +79,5 @@ extern asmlinkage void smp_call_function_interrupt(void); | |||
79 | 79 | ||
80 | extern void arch_send_call_function_single_ipi(int cpu); | 80 | extern void arch_send_call_function_single_ipi(int cpu); |
81 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 81 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
82 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
83 | 82 | ||
84 | #endif /* __ASM_SMP_H */ | 83 | #endif /* __ASM_SMP_H */ |
diff --git a/arch/parisc/include/asm/smp.h b/arch/parisc/include/asm/smp.h index 21eb45a52629..2e73623feb6b 100644 --- a/arch/parisc/include/asm/smp.h +++ b/arch/parisc/include/asm/smp.h | |||
@@ -30,7 +30,6 @@ extern void smp_send_all_nop(void); | |||
30 | 30 | ||
31 | extern void arch_send_call_function_single_ipi(int cpu); | 31 | extern void arch_send_call_function_single_ipi(int cpu); |
32 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 32 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
33 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
34 | 33 | ||
35 | #endif /* !ASSEMBLY */ | 34 | #endif /* !ASSEMBLY */ |
36 | 35 | ||
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h index 1491bfe822d9..d9ea8d39c342 100644 --- a/arch/powerpc/include/asm/smp.h +++ b/arch/powerpc/include/asm/smp.h | |||
@@ -147,7 +147,6 @@ extern struct smp_ops_t *smp_ops; | |||
147 | 147 | ||
148 | extern void arch_send_call_function_single_ipi(int cpu); | 148 | extern void arch_send_call_function_single_ipi(int cpu); |
149 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 149 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
150 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
151 | 150 | ||
152 | /* Definitions relative to the secondary CPU spin loop | 151 | /* Definitions relative to the secondary CPU spin loop |
153 | * and entry point. Not all of them exist on both 32 and | 152 | * and entry point. Not all of them exist on both 32 and |
diff --git a/arch/s390/include/asm/smp.h b/arch/s390/include/asm/smp.h index 6de62189a48f..a868b272c257 100644 --- a/arch/s390/include/asm/smp.h +++ b/arch/s390/include/asm/smp.h | |||
@@ -63,7 +63,6 @@ extern int smp_cpu_polarization[]; | |||
63 | 63 | ||
64 | extern void arch_send_call_function_single_ipi(int cpu); | 64 | extern void arch_send_call_function_single_ipi(int cpu); |
65 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 65 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
66 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
67 | 66 | ||
68 | #endif | 67 | #endif |
69 | 68 | ||
diff --git a/arch/sh/include/asm/smp.h b/arch/sh/include/asm/smp.h index ca64f43abe67..53ef26ced75f 100644 --- a/arch/sh/include/asm/smp.h +++ b/arch/sh/include/asm/smp.h | |||
@@ -44,7 +44,6 @@ void plat_send_ipi(unsigned int cpu, unsigned int message); | |||
44 | 44 | ||
45 | void arch_send_call_function_single_ipi(int cpu); | 45 | void arch_send_call_function_single_ipi(int cpu); |
46 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 46 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
47 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
48 | 47 | ||
49 | #else | 48 | #else |
50 | 49 | ||
diff --git a/arch/sparc/include/asm/smp_64.h b/arch/sparc/include/asm/smp_64.h index becb6bf353a9..f49e11cd4ded 100644 --- a/arch/sparc/include/asm/smp_64.h +++ b/arch/sparc/include/asm/smp_64.h | |||
@@ -36,7 +36,6 @@ extern int sparc64_multi_core; | |||
36 | 36 | ||
37 | extern void arch_send_call_function_single_ipi(int cpu); | 37 | extern void arch_send_call_function_single_ipi(int cpu); |
38 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 38 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
39 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
40 | 39 | ||
41 | /* | 40 | /* |
42 | * General functions that each host system must provide. | 41 | * General functions that each host system must provide. |
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index 6a84ed166aec..1e796782cd7b 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h | |||
@@ -121,7 +121,6 @@ static inline void arch_send_call_function_single_ipi(int cpu) | |||
121 | smp_ops.send_call_func_single_ipi(cpu); | 121 | smp_ops.send_call_func_single_ipi(cpu); |
122 | } | 122 | } |
123 | 123 | ||
124 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
125 | static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask) | 124 | static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask) |
126 | { | 125 | { |
127 | smp_ops.send_call_func_ipi(mask); | 126 | smp_ops.send_call_func_ipi(mask); |
diff --git a/kernel/smp.c b/kernel/smp.c index fd47a256a24e..c9d1c7835c2f 100644 --- a/kernel/smp.c +++ b/kernel/smp.c | |||
@@ -347,13 +347,6 @@ void __smp_call_function_single(int cpu, struct call_single_data *data, | |||
347 | generic_exec_single(cpu, data, wait); | 347 | generic_exec_single(cpu, data, wait); |
348 | } | 348 | } |
349 | 349 | ||
350 | /* Deprecated: shim for archs using old arch_send_call_function_ipi API. */ | ||
351 | |||
352 | #ifndef arch_send_call_function_ipi_mask | ||
353 | # define arch_send_call_function_ipi_mask(maskp) \ | ||
354 | arch_send_call_function_ipi(*(maskp)) | ||
355 | #endif | ||
356 | |||
357 | /** | 350 | /** |
358 | * smp_call_function_many(): Run a function on a set of other CPUs. | 351 | * smp_call_function_many(): Run a function on a set of other CPUs. |
359 | * @mask: The set of cpus to run on (only runs on online subset). | 352 | * @mask: The set of cpus to run on (only runs on online subset). |