Commit c9b7b826 authored by Anton Blanchard's avatar Anton Blanchard

ppc64: merge in ppc32 changes to atomic_dec_and_lock

parent 9488f6b2
...@@ -7,32 +7,49 @@ ...@@ -7,32 +7,49 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#include <linux/module.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/system.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/system.h>
/*
* This is an implementation of the notion of "decrement a
* reference count, and return locked if it decremented to zero".
*
* This implementation can be used on any architecture that
* has a cmpxchg, and where atomic->value is an int holding
* the value of the atomic (i.e. the high bits aren't used
* for a lock or anything like that).
*
* N.B. ATOMIC_DEC_AND_LOCK gets defined in include/linux/spinlock.h
* if spinlocks are empty and thus atomic_dec_and_lock is defined
* to be atomic_dec_and_test - in that case we don't need it
* defined here as well.
*/
#ifndef ATOMIC_DEC_AND_LOCK
int atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock) int atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
{ {
int counter; int counter;
int newcount; int newcount;
repeat: for (;;) {
counter = atomic_read(atomic); counter = atomic_read(atomic);
newcount = counter-1; newcount = counter - 1;
if (!newcount) if (!newcount)
goto slow_path; break; /* do it the slow way */
newcount = cmpxchg(&atomic->counter, counter, newcount); newcount = cmpxchg(&atomic->counter, counter, newcount);
if (newcount == counter)
if (newcount != counter)
goto repeat;
return 0; return 0;
}
slow_path:
spin_lock(lock); spin_lock(lock);
if (atomic_dec_and_test(atomic)) if (atomic_dec_and_test(atomic))
return 1; return 1;
spin_unlock(lock); spin_unlock(lock);
return 0; return 0;
} }
EXPORT_SYMBOL(atomic_dec_and_lock);
#endif /* ATOMIC_DEC_AND_LOCK */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment