]> err.no Git - linux-2.6/commitdiff
[PATCH] lockdep: mutex section binutils workaround
authorIngo Molnar <mingo@elte.hu>
Mon, 3 Jul 2006 07:24:33 +0000 (00:24 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 3 Jul 2006 22:27:01 +0000 (15:27 -0700)
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>
kernel/mutex.c

index 3aad0b7992f4bd94e99ba18d8ecdbf7552d5d383..43a50c18701abb149d274f22e290d355416bdf81 100644 (file)
@@ -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);