diff options
author | 2005-09-12 12:45:04 -0700 | |
---|---|---|
committer | 2005-09-12 12:45:04 -0700 | |
commit | d58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch) | |
tree | d9a7e35eb88fea6265d5aadcc3d4ed39122b052a /lib/dec_and_lock.c | |
parent | [PATCH] crc16: remove w1 specific comments. (diff) | |
parent | [PATCH] x86-64: clean up local_add/sub arguments (diff) | |
download | wireguard-linux-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.tar.xz wireguard-linux-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.zip |
Merge ../torvalds-2.6/
Diffstat (limited to 'lib/dec_and_lock.c')
-rw-r--r-- | lib/dec_and_lock.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/dec_and_lock.c b/lib/dec_and_lock.c index 6658d81e1836..2377af057d09 100644 --- a/lib/dec_and_lock.c +++ b/lib/dec_and_lock.c @@ -25,8 +25,6 @@ * this is trivially done efficiently using a load-locked * store-conditional approach, for example. */ - -#ifndef ATOMIC_DEC_AND_LOCK int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock) { spin_lock(lock); @@ -37,4 +35,3 @@ int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock) } EXPORT_SYMBOL(_atomic_dec_and_lock); -#endif |