Merge branch 'linus' into perfcounters/core

[linux-2.6-block.git] / kernel / mutex.c

diff --git a/kernel/mutex.c b/kernel/mutex.c
index 507cf2b5e9f1e6328b2e335a3a05c0ead6a0ff3e..f415e80a9119f405e59a1a4c5950015b6080da52 100644 (file)
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -89,7 +89,7 @@ __mutex_lock_slowpath(atomic_t *lock_count);
  *
  * This function is similar to (but not equivalent to) down().
  */
-void inline __sched mutex_lock(struct mutex *lock)
+void __sched mutex_lock(struct mutex *lock)
 {
        might_sleep();
        /*