diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 13:22:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 13:22:37 +0100 |
| commit | 6967963d6d5cac40a091d075326f0e3ccb95c58a (patch) | |
| tree | a9c29ac6450a7d1dc815f9d97f726ecd59271812 /include/linux/smp.h | |
| parent | 9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038 (diff) | |
| parent | 34e51ce60a210094bd66cf0a75dd8512247618ca (diff) | |
| download | kernel-crypto-6967963d6d5cac40a091d075326f0e3ccb95c58a.tar.gz kernel-crypto-6967963d6d5cac40a091d075326f0e3ccb95c58a.tar.xz kernel-crypto-6967963d6d5cac40a091d075326f0e3ccb95c58a.zip | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'include/linux/smp.h')
| -rw-r--r-- | include/linux/smp.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h index 715196b09d6..a69db820eed 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h @@ -38,7 +38,7 @@ int smp_call_function_single(int cpuid, void (*func) (void *info), void *info, /* * main cross-CPU interfaces, handles INIT, TLB flush, STOP, etc. * (defined in asm header): - */ + */ /* * stops all CPUs but the current one: @@ -82,7 +82,8 @@ smp_call_function_mask(cpumask_t mask, void(*func)(void *info), void *info, return 0; } -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); /* * Generic and arch helpers @@ -121,6 +122,8 @@ extern unsigned int setup_max_cpus; #else /* !SMP */ +static inline void smp_send_stop(void) { } + /* * These macros fold the SMP functionality into a single CPU system */ @@ -176,6 +179,12 @@ static inline void init_call_single_data(void) #define put_cpu() preempt_enable() #define put_cpu_no_resched() preempt_enable_no_resched() +/* + * Callback to arch code if there's nosmp or maxcpus=0 on the + * boot command line: + */ +extern void arch_disable_smp_support(void); + void smp_setup_processor_id(void); #endif /* __LINUX_SMP_H */ |