[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1326272868.2442.122.camel@twins>
Date: Wed, 11 Jan 2012 10:07:48 +0100
From: Peter Zijlstra <a.p.zijlstra@...llo.nl>
To: Christian Borntraeger <borntraeger@...ibm.com>
Cc: Ingo Molnar <mingo@...e.hu>,
Martin Schwidefsky <schwidefsky@...ibm.com>,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] sched/s390: fix compile error in sched/core.c
On Wed, 2012-01-11 at 08:58 +0100, Christian Borntraeger wrote:
> From: Christian Borntraeger <borntraeger@...ibm.com>
>
> commit 029632fbb7b7c9d85063cc9eb470de6c54873df3
> sched: Make separate sched*.c translation units
>
> removed the include of asm/mutex.h from sched.c. This breaks the combination of
>
> CONFIG_MUTEX_SPIN_ON_OWNER=yes
> CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX=yes
> like s390 without mutex debugging:
>
> CC kernel/sched/core.o
> kernel/sched/core.c: In function ‘mutex_spin_on_owner’:
> kernel/sched/core.c:3287: error: implicit declaration of function ‘arch_mutex_cpu_relax’
> make[2]: *** [kernel/sched/core.o] Error 1
>
> Lets re-add the include to kernel/sched/core.c
Weird, I would have expected -next to pick this up.. Anyway, no
objection although do we really need that extra #ifdef ?
> Signed-off-by: Christian Borntraeger <borntraeger@...ibm.com>
> ---
> kernel/sched/core.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index cecbb64..f82efdc 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -74,6 +74,9 @@
>
> #include <asm/tlb.h>
> #include <asm/irq_regs.h>
> +#ifdef CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX
> +#include <asm/mutex.h>
> +#endif
> #ifdef CONFIG_PARAVIRT
> #include <asm/paravirt.h>
> #endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists