Messages in this thread Patch in this message | | | Subject | Re: x86 arch updates also broke s390 | From | Martin Schwidefsky <> | Date | Fri, 01 Feb 2008 10:54:13 +0100 |
| |
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 <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
| |