aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 17:33:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 17:33:30 -0700
commitb1dbb67911fecb290db3f566281bcd9ccc9dc6df (patch)
treef55add06f624f7fed8a68372d8c96b583ca578fe /arch
parent492f59f526d95e73028f57bff475b4bbe3c8cb72 (diff)
parent70f454408e68fdba2c2529ab7d6ec3c3525e59f2 (diff)
downloadlinux-linaro-stable-b1dbb67911fecb290db3f566281bcd9ccc9dc6df.tar.gz
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
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/include/asm/smp.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/s390/include/asm/smp.h b/arch/s390/include/asm/smp.h
index 2009158a4502..72137bc907ac 100644
--- a/arch/s390/include/asm/smp.h
+++ b/arch/s390/include/asm/smp.h
@@ -92,12 +92,6 @@ extern void arch_send_call_function_ipi(cpumask_t mask);
#endif
#ifndef CONFIG_SMP
-static inline void smp_send_stop(void)
-{
- /* Disable all interrupts/machine checks */
- __load_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK);
-}
-
#define hard_smp_processor_id() 0
#define smp_cpu_not_running(cpu) 1
#endif