[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-db7e527da41560f597ccdc4417cefa6b7657c0c0@git.kernel.org>
Date: Thu, 26 Jan 2012 12:26:21 -0800
From: tip-bot for Christian Borntraeger <borntraeger@...ibm.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
a.p.zijlstra@...llo.nl, tglx@...utronix.de, borntraeger@...ibm.com,
mingo@...e.hu
Subject: [tip:sched/urgent] sched/s390: Fix compile error in sched/core.c
Commit-ID: db7e527da41560f597ccdc4417cefa6b7657c0c0
Gitweb: http://git.kernel.org/tip/db7e527da41560f597ccdc4417cefa6b7657c0c0
Author: Christian Borntraeger <borntraeger@...ibm.com>
AuthorDate: Wed, 11 Jan 2012 08:58:16 +0100
Committer: Ingo Molnar <mingo@...e.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@...ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Link: http://lkml.kernel.org/r/1326268696-30904-1-git-send-email-borntraeger@de.ibm.com
Signed-off-by: Ingo Molnar <mingo@...e.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
--
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