On Fri, 20 Mar 2009 10:42:08 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> The linux-next build for s390 allnoconfig failed like this:
>
> In file included from arch/s390/include/asm/tlb.h:29,
> from arch/s390/mm/pgtable.c:25:
> arch/s390/include/asm/smp.h:95: error: redefinition of 'smp_send_stop'
> include/linux/smp.h:125: error: previous definition of 'smp_send_stop' was here
>
> Caused by commit d1dedb52acd98bd5e13e1ff4c4d045d58bbd16fe ("panic, smp:
> provide smp_send_stop() wrapper on UP too") from the tip-core tree.
Ingo, could you pick up the patch below?
Subject: [PATCH] s390: remove arch specific smp_send_stop
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Remove arch specific smp_send_stop for !CONFIG_SMP since it conflicts
with a new generic version.
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
---
arch/s390/include/asm/smp.h | 6 ------
1 file changed, 6 deletions(-)
Index: linux-next/arch/s390/include/asm/smp.h
===================================================================
--- linux-next.orig/arch/s390/include/asm/smp.h
+++ linux-next/arch/s390/include/asm/smp.h
@@ -92,12 +92,6 @@ extern void arch_send_call_function_ipi(
#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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
