diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2006-12-06 23:38:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:38 -0500 |
commit | 83df8db9e62129975fab6d800fb381faf0dfee74 (patch) | |
tree | 0590a90ac51ab2df40210dc3d2001fb9f6f271e9 /include | |
parent | b4c6c34a530b4d1c626f4ac0a884e0a9b849378c (diff) |
[PATCH] declare smp_call_function_single in generic code
smp_call_function_single() needs to be visible in non-SMP builds, to fix:
arch/x86_64/kernel/vsyscall.c:283: warning: implicit declaration of function 'smp_call_function_single'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86_64/smp.h | 7 | ||||
-rw-r--r-- | include/linux/smp.h | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h index d6b7c057edba..f1bdd500d7ac 100644 --- a/include/asm-x86_64/smp.h +++ b/include/asm-x86_64/smp.h | |||
@@ -118,13 +118,6 @@ static __inline int logical_smp_processor_id(void) | |||
118 | #define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu] | 118 | #define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu] |
119 | #else | 119 | #else |
120 | #define cpu_physical_id(cpu) boot_cpu_id | 120 | #define cpu_physical_id(cpu) boot_cpu_id |
121 | static inline int smp_call_function_single(int cpuid, void (*func) (void *info), | ||
122 | void *info, int retry, int wait) | ||
123 | { | ||
124 | /* Disable interrupts here? */ | ||
125 | func(info); | ||
126 | return 0; | ||
127 | } | ||
128 | #endif /* !CONFIG_SMP */ | 121 | #endif /* !CONFIG_SMP */ |
129 | #endif | 122 | #endif |
130 | 123 | ||
diff --git a/include/linux/smp.h b/include/linux/smp.h index 51649987f691..7ba23ec8211b 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h | |||
@@ -99,6 +99,13 @@ static inline int up_smp_call_function(void) | |||
99 | static inline void smp_send_reschedule(int cpu) { } | 99 | static inline void smp_send_reschedule(int cpu) { } |
100 | #define num_booting_cpus() 1 | 100 | #define num_booting_cpus() 1 |
101 | #define smp_prepare_boot_cpu() do {} while (0) | 101 | #define smp_prepare_boot_cpu() do {} while (0) |
102 | static inline int smp_call_function_single(int cpuid, void (*func) (void *info), | ||
103 | void *info, int retry, int wait) | ||
104 | { | ||
105 | /* Disable interrupts here? */ | ||
106 | func(info); | ||
107 | return 0; | ||
108 | } | ||
102 | 109 | ||
103 | #endif /* !SMP */ | 110 | #endif /* !SMP */ |
104 | 111 | ||