diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 06:05:58 -0400 |
commit | cd80a8142efa3468c2cd9fb52845f334c3220d54 (patch) | |
tree | 919e88994bd3c09b34ce852d0a09bb0655d231d0 /include/linux/smp.h | |
parent | 641cd4cfcdc71ce01535b31cc4d57d59a1fae1fc (diff) | |
parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) |
Merge branch 'x86/core' into core/ipi
Diffstat (limited to 'include/linux/smp.h')
-rw-r--r-- | include/linux/smp.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h index 00866d7fdf34..2d3bcb6b37ff 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h | |||
@@ -177,6 +177,12 @@ static inline void init_call_single_data(void) | |||
177 | #define put_cpu() preempt_enable() | 177 | #define put_cpu() preempt_enable() |
178 | #define put_cpu_no_resched() preempt_enable_no_resched() | 178 | #define put_cpu_no_resched() preempt_enable_no_resched() |
179 | 179 | ||
180 | /* | ||
181 | * Callback to arch code if there's nosmp or maxcpus=0 on the | ||
182 | * boot command line: | ||
183 | */ | ||
184 | extern void arch_disable_smp_support(void); | ||
185 | |||
180 | void smp_setup_processor_id(void); | 186 | void smp_setup_processor_id(void); |
181 | 187 | ||
182 | #endif /* __LINUX_SMP_H */ | 188 | #endif /* __LINUX_SMP_H */ |