summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-07-03 00:24:33 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-03 15:27:01 -0700
commit9cebb5526833059f327d237a032422c762378b2a (patch)
tree7ef264c1a33db3f63e71cc00ed9fa9c8bd396edc
parent9a11b49a805665e13a56aa067afaf81d43ec1514 (diff)
downloadop-kernel-dev-9cebb5526833059f327d237a032422c762378b2a.zip
op-kernel-dev-9cebb5526833059f327d237a032422c762378b2a.tar.gz
[PATCH] lockdep: mutex section binutils workaround
Work around weird section nesting build bug causing smp-alternatives failures under certain circumstances. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--kernel/mutex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c
index 3aad0b7..43a50c1 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -313,7 +313,7 @@ static inline int __mutex_trylock_slowpath(atomic_t *lock_count)
* This function must not be used in interrupt context. The
* mutex must be released by the same task that acquired it.
*/
-int fastcall mutex_trylock(struct mutex *lock)
+int fastcall __sched mutex_trylock(struct mutex *lock)
{
return __mutex_fastpath_trylock(&lock->count,
__mutex_trylock_slowpath);
OpenPOWER on IntegriCloud