From: Heiko Carstens <heiko.carstens@de•ibm.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Martin Schwidefsky <schwidefsky@de•ibm.com>,
linux-next@vger•kernel.org, Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@elte•hu>, "H. Peter Anvin" <hpa@zytor•com>
Subject: Re: linux-next: s390 build failure
Date: Fri, 20 Mar 2009 09:24:10 +0100 [thread overview]
Message-ID: <20090320092410.30d2bac3@osiris.boeblingen.de.ibm.com> (raw)
In-Reply-To: <20090320104208.0cb4b2b5.sfr@canb.auug.org.au>
On Fri, 20 Mar 2009 10:42:08 +1100
Stephen Rothwell <sfr@canb•auug.org.au> 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@de•ibm.com>
Remove arch specific smp_send_stop for !CONFIG_SMP since it conflicts
with a new generic version.
Cc: Martin Schwidefsky <schwidefsky@de•ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de•ibm.com>
---
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
next prev parent reply other threads:[~2009-03-20 8:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-19 23:42 linux-next: s390 build failure Stephen Rothwell
2009-03-20 8:24 ` Heiko Carstens [this message]
2009-03-20 10:00 ` Ingo Molnar
2009-03-20 10:33 ` Heiko Carstens
-- strict thread matches above, loose matches on Subject: below --
2009-03-19 23:53 Stephen Rothwell
2008-06-20 3:52 Stephen Rothwell
2008-06-20 7:58 ` Cornelia Huck
2008-06-23 15:22 ` Cornelia Huck
2008-06-23 22:13 ` Greg KH
2008-06-20 2:42 Stephen Rothwell
2008-06-20 11:42 ` Jens Axboe
2008-06-21 8:07 ` Heiko Carstens
2008-06-26 9:14 ` Jens Axboe
2008-06-20 11:51 ` Martin Schwidefsky
2008-05-12 8:03 Stephen Rothwell
2008-05-12 16:49 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090320092410.30d2bac3@osiris.boeblingen.de.ibm.com \
--to=heiko.carstens@de$(echo .)ibm.com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox