Merge branch 'ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: s390: remove arch specific smp_send_stop() panic: clean up kernel/panic.c panic, smp: provide smp_send_stop() wrapper on UP too panic: decrease oops_in_progress only after having done the panic generic-ipi: eliminate WARN_ON()s during oops/panic generic-ipi: cleanups generic-ipi: remove CSD_FLAG_WAIT generic-ipi: remove kmalloc() generic IPI: simplify barriers and locking
This commit is contained in:
commit
b1dbb67911
7 changed files with 307 additions and 265 deletions
|
|
@ -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
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue