|
@@ -112,7 +112,7 @@ extern void __mutex_init(struct mutex *lock, const char *name,
|
|
*
|
|
*
|
|
* Returns 1 if the mutex is locked, 0 if unlocked.
|
|
* Returns 1 if the mutex is locked, 0 if unlocked.
|
|
*/
|
|
*/
|
|
-static inline int fastcall mutex_is_locked(struct mutex *lock)
|
|
|
|
|
|
+static inline int mutex_is_locked(struct mutex *lock)
|
|
{
|
|
{
|
|
return atomic_read(&lock->count) != 1;
|
|
return atomic_read(&lock->count) != 1;
|
|
}
|
|
}
|
|
@@ -132,9 +132,9 @@ extern int __must_check mutex_lock_killable_nested(struct mutex *lock,
|
|
#define mutex_lock_interruptible(lock) mutex_lock_interruptible_nested(lock, 0)
|
|
#define mutex_lock_interruptible(lock) mutex_lock_interruptible_nested(lock, 0)
|
|
#define mutex_lock_killable(lock) mutex_lock_killable_nested(lock, 0)
|
|
#define mutex_lock_killable(lock) mutex_lock_killable_nested(lock, 0)
|
|
#else
|
|
#else
|
|
-extern void fastcall mutex_lock(struct mutex *lock);
|
|
|
|
-extern int __must_check fastcall mutex_lock_interruptible(struct mutex *lock);
|
|
|
|
-extern int __must_check fastcall mutex_lock_killable(struct mutex *lock);
|
|
|
|
|
|
+extern void mutex_lock(struct mutex *lock);
|
|
|
|
+extern int __must_check mutex_lock_interruptible(struct mutex *lock);
|
|
|
|
+extern int __must_check mutex_lock_killable(struct mutex *lock);
|
|
|
|
|
|
# define mutex_lock_nested(lock, subclass) mutex_lock(lock)
|
|
# define mutex_lock_nested(lock, subclass) mutex_lock(lock)
|
|
# define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)
|
|
# define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)
|
|
@@ -145,7 +145,7 @@ extern int __must_check fastcall mutex_lock_killable(struct mutex *lock);
|
|
* NOTE: mutex_trylock() follows the spin_trylock() convention,
|
|
* NOTE: mutex_trylock() follows the spin_trylock() convention,
|
|
* not the down_trylock() convention!
|
|
* not the down_trylock() convention!
|
|
*/
|
|
*/
|
|
-extern int fastcall mutex_trylock(struct mutex *lock);
|
|
|
|
-extern void fastcall mutex_unlock(struct mutex *lock);
|
|
|
|
|
|
+extern int mutex_trylock(struct mutex *lock);
|
|
|
|
+extern void mutex_unlock(struct mutex *lock);
|
|
|
|
|
|
#endif
|
|
#endif
|