diff options
author | Ingo Molnar <mingo@elte.hu> | 2006-07-03 03:24:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 18:27:01 -0400 |
commit | 9cebb5526833059f327d237a032422c762378b2a (patch) | |
tree | 7ef264c1a33db3f63e71cc00ed9fa9c8bd396edc /kernel/mutex.c | |
parent | 9a11b49a805665e13a56aa067afaf81d43ec1514 (diff) |
[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>
Diffstat (limited to 'kernel/mutex.c')
-rw-r--r-- | kernel/mutex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c index 3aad0b7992f4..43a50c18701a 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c | |||
@@ -313,7 +313,7 @@ static inline int __mutex_trylock_slowpath(atomic_t *lock_count) | |||
313 | * This function must not be used in interrupt context. The | 313 | * This function must not be used in interrupt context. The |
314 | * mutex must be released by the same task that acquired it. | 314 | * mutex must be released by the same task that acquired it. |
315 | */ | 315 | */ |
316 | int fastcall mutex_trylock(struct mutex *lock) | 316 | int fastcall __sched mutex_trylock(struct mutex *lock) |
317 | { | 317 | { |
318 | return __mutex_fastpath_trylock(&lock->count, | 318 | return __mutex_fastpath_trylock(&lock->count, |
319 | __mutex_trylock_slowpath); | 319 | __mutex_trylock_slowpath); |