diff options
author | Linus Torvalds | 2009-06-10 16:19:40 -0700 |
---|---|---|
committer | Linus Torvalds | 2009-06-10 16:19:40 -0700 |
commit | e7241d771419b8a8671ebc46a043c324ccb0dcf7 (patch) | |
tree | 77f1bc9c635e2ac29396816ce9ef9cbdb6853884 /include | |
parent | 3f6280ddf25fa656d0e17960588e52bee48a7547 (diff) | |
parent | 04dce7d9d429ea5ea04e9432d1726c930f4d67da (diff) |
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
spinlock: Add missing __raw_spin_lock_flags() stub for UP
mutex: add atomic_dec_and_mutex_lock(), fix
locking, rtmutex.c: Documentation cleanup
mutex: add atomic_dec_and_mutex_lock()
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mutex.h | 1 | ||||
-rw-r--r-- | include/linux/spinlock_up.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 3069ec7e0ab8..878cab4f5fcc 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -150,5 +150,6 @@ extern int __must_check mutex_lock_killable(struct mutex *lock); */ extern int mutex_trylock(struct mutex *lock); extern void mutex_unlock(struct mutex *lock); +extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock); #endif diff --git a/include/linux/spinlock_up.h b/include/linux/spinlock_up.h index 938234c4a996..d4841ed8215b 100644 --- a/include/linux/spinlock_up.h +++ b/include/linux/spinlock_up.h @@ -60,6 +60,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock) #define __raw_spin_is_locked(lock) ((void)(lock), 0) /* for sched.c and kernel_lock.c: */ # define __raw_spin_lock(lock) do { (void)(lock); } while (0) +# define __raw_spin_lock_flags(lock, flags) do { (void)(lock); } while (0) # define __raw_spin_unlock(lock) do { (void)(lock); } while (0) # define __raw_spin_trylock(lock) ({ (void)(lock); 1; }) #endif /* DEBUG_SPINLOCK */ |