* [PATCH] sched/s390: fix compile error in sched/core.c
@ 2012-01-11 7:58 Christian Borntraeger
2012-01-11 9:07 ` Peter Zijlstra
2012-01-26 20:26 ` [tip:sched/urgent] sched/s390: Fix " tip-bot for Christian Borntraeger
0 siblings, 2 replies; 6+ messages in thread
From: Christian Borntraeger @ 2012-01-11 7:58 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Ingo Molnar, Martin Schwidefsky, linux-kernel,
Christian Borntraeger
From: Christian Borntraeger <borntraeger@de.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
Signed-off-by: Christian Borntraeger <borntraeger@de.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
--
1.7.8.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] sched/s390: fix compile error in sched/core.c
2012-01-11 7:58 [PATCH] sched/s390: fix compile error in sched/core.c Christian Borntraeger
@ 2012-01-11 9:07 ` Peter Zijlstra
2012-01-11 9:17 ` Christian Borntraeger
2012-01-18 9:33 ` Christian Borntraeger
2012-01-26 20:26 ` [tip:sched/urgent] sched/s390: Fix " tip-bot for Christian Borntraeger
1 sibling, 2 replies; 6+ messages in thread
From: Peter Zijlstra @ 2012-01-11 9:07 UTC (permalink / raw)
To: Christian Borntraeger; +Cc: Ingo Molnar, Martin Schwidefsky, linux-kernel
On Wed, 2012-01-11 at 08:58 +0100, Christian Borntraeger wrote:
> From: Christian Borntraeger <borntraeger@de.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@de.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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] sched/s390: fix compile error in sched/core.c
2012-01-11 9:07 ` Peter Zijlstra
@ 2012-01-11 9:17 ` Christian Borntraeger
2012-01-18 9:33 ` Christian Borntraeger
1 sibling, 0 replies; 6+ messages in thread
From: Christian Borntraeger @ 2012-01-11 9:17 UTC (permalink / raw)
To: Peter Zijlstra; +Cc: Ingo Molnar, Martin Schwidefsky, linux-kernel
On 11/01/12 10:07, Peter Zijlstra wrote:
> On Wed, 2012-01-11 at 08:58 +0100, Christian Borntraeger wrote:
>> From: Christian Borntraeger <borntraeger@de.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..
Maybe the builds of next runs with DEBUG_MUTEXES, which disables MUTEX_SPIN_ON_OWNER.
> Anyway, no objection although do we really need that extra #ifdef ?
Dont think so. I consider this more as a comment why we need this. Whoever applies the patch,
feel free to remove the ifdefs.
Christian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] sched/s390: fix compile error in sched/core.c
2012-01-11 9:07 ` Peter Zijlstra
2012-01-11 9:17 ` Christian Borntraeger
@ 2012-01-18 9:33 ` Christian Borntraeger
2012-01-24 10:04 ` Peter Zijlstra
1 sibling, 1 reply; 6+ messages in thread
From: Christian Borntraeger @ 2012-01-18 9:33 UTC (permalink / raw)
To: Peter Zijlstra; +Cc: Ingo Molnar, Martin Schwidefsky, linux-kernel
On 11/01/12 10:07, Peter Zijlstra wrote:
> Weird, I would have expected -next to pick this up.. Anyway, no
> objection although do we really need that extra #ifdef ?
Ping.
Do you want me to resubmit without ifdefs?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] sched/s390: fix compile error in sched/core.c
2012-01-18 9:33 ` Christian Borntraeger
@ 2012-01-24 10:04 ` Peter Zijlstra
0 siblings, 0 replies; 6+ messages in thread
From: Peter Zijlstra @ 2012-01-24 10:04 UTC (permalink / raw)
To: Christian Borntraeger; +Cc: Ingo Molnar, Martin Schwidefsky, linux-kernel
On Wed, 2012-01-18 at 10:33 +0100, Christian Borntraeger wrote:
> On 11/01/12 10:07, Peter Zijlstra wrote:
>
> > Weird, I would have expected -next to pick this up.. Anyway, no
> > objection although do we really need that extra #ifdef ?
>
> Ping.
> Do you want me to resubmit without ifdefs?
Drat, sorry for loosing this. Applied (and removed the ifdeffery
myself). Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip:sched/urgent] sched/s390: Fix compile error in sched/core.c
2012-01-11 7:58 [PATCH] sched/s390: fix compile error in sched/core.c Christian Borntraeger
2012-01-11 9:07 ` Peter Zijlstra
@ 2012-01-26 20:26 ` tip-bot for Christian Borntraeger
1 sibling, 0 replies; 6+ messages in thread
From: tip-bot for Christian Borntraeger @ 2012-01-26 20:26 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, a.p.zijlstra, tglx, borntraeger, mingo
Commit-ID: db7e527da41560f597ccdc4417cefa6b7657c0c0
Gitweb: http://git.kernel.org/tip/db7e527da41560f597ccdc4417cefa6b7657c0c0
Author: Christian Borntraeger <borntraeger@de.ibm.com>
AuthorDate: Wed, 11 Jan 2012 08:58:16 +0100
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 26 Jan 2012 19:38:11 +0100
sched/s390: Fix compile error in sched/core.c
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’
Lets re-add the include to kernel/sched/core.c
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1326268696-30904-1-git-send-email-borntraeger@de.ibm.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
kernel/sched/core.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index e067df1..5255c9d 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -74,6 +74,7 @@
#include <asm/tlb.h>
#include <asm/irq_regs.h>
+#include <asm/mutex.h>
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>
#endif
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-01-26 20:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-11 7:58 [PATCH] sched/s390: fix compile error in sched/core.c Christian Borntraeger
2012-01-11 9:07 ` Peter Zijlstra
2012-01-11 9:17 ` Christian Borntraeger
2012-01-18 9:33 ` Christian Borntraeger
2012-01-24 10:04 ` Peter Zijlstra
2012-01-26 20:26 ` [tip:sched/urgent] sched/s390: Fix " tip-bot for Christian Borntraeger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.