Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762914AbYBAJ6T (ORCPT ); Fri, 1 Feb 2008 04:58:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759331AbYBAJyQ (ORCPT ); Fri, 1 Feb 2008 04:54:16 -0500 Received: from mtagate1.de.ibm.com ([195.212.29.150]:41860 "EHLO mtagate1.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759295AbYBAJyP (ORCPT ); Fri, 1 Feb 2008 04:54:15 -0500 Subject: Re: x86 arch updates also broke s390 From: Martin Schwidefsky Reply-To: schwidefsky@de.ibm.com To: Ingo Molnar Cc: Adrian Bunk , Linus Torvalds , linux-kernel@vger.kernel.org, Andrew Morton , Thomas Gleixner , "H. Peter Anvin" , Nick Piggin , heiko.carstens@de.ibm.com, linux390@de.ibm.com In-Reply-To: <20080201094839.GA29836@elte.hu> References: <20080130011550.GA31853@elte.hu> <20080131003310.GW29368@does.not.exist> <1201772094.18221.32.camel@localhost> <20080201094839.GA29836@elte.hu> Content-Type: text/plain Organization: IBM Corporation Date: Fri, 01 Feb 2008 10:54:13 +0100 Message-Id: <1201859653.27899.2.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1748 Lines: 63 On Fri, 2008-02-01 at 10:48 +0100, Ingo Molnar wrote: > > Defining GENERIC_LOCKBREAK in arch/s390/Kconfig takes care of it. > I'll > > cook up a patch and queue it in git390. > > the one below should do the trick. Thanks but I already queued a different one (see below). The other architectures that define GENERIC_LOCKBREAK have the "depends on SMP && PREEMPT" line as well. The line does make sense if you look at the way how spin_is_contended is used, no ? -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. --- Subject: [PATCH] Define GENERIC_LOCKBREAK. From: Martin Schwidefsky Fix compile error: CC arch/s390/kernel/asm-offsets.s In file included from arch/s390/kernel/asm-offsets.c:7: include/linux/sched.h: In function 'spin_needbreak': include/linux/sched.h:1931: error: implicit declaration of function '__raw_spin_is_contended' make[2]: *** [arch/s390/kernel/asm-offsets.s] Error 1 Signed-off-by: Martin Schwidefsky --- arch/s390/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff -urpN linux-2.6/arch/s390/Kconfig linux-2.6-patched/arch/s390/Kconfig --- linux-2.6/arch/s390/Kconfig 2008-01-31 13:57:33.000000000 +0100 +++ linux-2.6-patched/arch/s390/Kconfig 2008-01-31 13:57:42.000000000 +0100 @@ -47,6 +47,11 @@ config NO_IOMEM config NO_DMA def_bool y +config GENERIC_LOCKBREAK + bool + default y + depends on SMP && PREEMPT + mainmenu "Linux Kernel Configuration" config S390 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/