git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
[pandora-kernel.git]
/
lib
/
dec_and_lock.c
diff --git
a/lib/dec_and_lock.c
b/lib/dec_and_lock.c
index
a65c314
..
e73822a
100644
(file)
--- a/
lib/dec_and_lock.c
+++ b/
lib/dec_and_lock.c
@@
-19,11
+19,10
@@
*/
int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
{
*/
int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
{
-#ifdef CONFIG_SMP
/* Subtract 1 from counter unless that drops it to 0 (ie. it was 1) */
if (atomic_add_unless(atomic, -1, 1))
return 0;
/* Subtract 1 from counter unless that drops it to 0 (ie. it was 1) */
if (atomic_add_unless(atomic, -1, 1))
return 0;
-#endif
+
/* Otherwise do it the slow way */
spin_lock(lock);
if (atomic_dec_and_test(atomic))
/* Otherwise do it the slow way */
spin_lock(lock);
if (atomic_dec_and_test(atomic))