Re: x86 arch updates also broke s390

Ingo Molnar
2008-02-01T09:57:52Z

* Ingo Molnar <mingo@elte.hu> 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.

ah, i see the one you queued up (below) is even better :)

Ingo

------------->
Subject: [PATCH] Define GENERIC_LOCKBREAK.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

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 <schwidefsky@de.ibm.com>
---

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