diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2013-11-14 17:32:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 19:32:22 -0500 |
commit | 7cf64f861b7a43b395f0855994003254b06a7e5a (patch) | |
tree | 9761b86bd60360bd1daa88fafee54b1bb7d4f06a /include/linux/smp.h | |
parent | 40c01e8bd5575e32633192513e09eac7155d6926 (diff) |
kernel-provide-a-__smp_call_function_single-stub-for-config_smp-fix
x86_64 allnoconfig:
kernel/up.c:25: error: redefinition of '__smp_call_function_single'
include/linux/smp.h:154: note: previous definition of '__smp_call_function_single' was here
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/smp.h')
-rw-r--r-- | include/linux/smp.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h index 78851513030d..5da22ee42e16 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h | |||
@@ -49,6 +49,9 @@ void on_each_cpu_cond(bool (*cond_func)(int cpu, void *info), | |||
49 | smp_call_func_t func, void *info, bool wait, | 49 | smp_call_func_t func, void *info, bool wait, |
50 | gfp_t gfp_flags); | 50 | gfp_t gfp_flags); |
51 | 51 | ||
52 | void __smp_call_function_single(int cpuid, struct call_single_data *data, | ||
53 | int wait); | ||
54 | |||
52 | #ifdef CONFIG_SMP | 55 | #ifdef CONFIG_SMP |
53 | 56 | ||
54 | #include <linux/preempt.h> | 57 | #include <linux/preempt.h> |
@@ -95,9 +98,6 @@ int smp_call_function(smp_call_func_t func, void *info, int wait); | |||
95 | void smp_call_function_many(const struct cpumask *mask, | 98 | void smp_call_function_many(const struct cpumask *mask, |
96 | smp_call_func_t func, void *info, bool wait); | 99 | smp_call_func_t func, void *info, bool wait); |
97 | 100 | ||
98 | void __smp_call_function_single(int cpuid, struct call_single_data *data, | ||
99 | int wait); | ||
100 | |||
101 | int smp_call_function_any(const struct cpumask *mask, | 101 | int smp_call_function_any(const struct cpumask *mask, |
102 | smp_call_func_t func, void *info, int wait); | 102 | smp_call_func_t func, void *info, int wait); |
103 | 103 | ||
@@ -151,12 +151,6 @@ smp_call_function_any(const struct cpumask *mask, smp_call_func_t func, | |||
151 | 151 | ||
152 | static inline void kick_all_cpus_sync(void) { } | 152 | static inline void kick_all_cpus_sync(void) { } |
153 | 153 | ||
154 | static inline void __smp_call_function_single(int cpuid, | ||
155 | struct call_single_data *data, int wait) | ||
156 | { | ||
157 | on_each_cpu(data->func, data->info, wait); | ||
158 | } | ||
159 | |||
160 | #endif /* !SMP */ | 154 | #endif /* !SMP */ |
161 | 155 | ||
162 | /* | 156 | /* |