git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
sparc
/
lib
/
atomic32.c
diff --git
a/arch/sparc/lib/atomic32.c
b/arch/sparc/lib/atomic32.c
index
19724c5
..
de84f85
100644
(file)
--- a/
arch/sparc/lib/atomic32.c
+++ b/
arch/sparc/lib/atomic32.c
@@
-20,7
+20,7
@@
spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] = {
#else /* SMP */
#else /* SMP */
-static
spinlock_t dummy = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(dummy)
;
#define ATOMIC_HASH_SIZE 1
#define ATOMIC_HASH(a) (&dummy)
#define ATOMIC_HASH_SIZE 1
#define ATOMIC_HASH(a) (&dummy)
@@
-37,17
+37,42
@@
int __atomic_add_return(int i, atomic_t *v)
spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
return ret;
}
spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
return ret;
}
+EXPORT_SYMBOL(__atomic_add_return);
-
void atomic_set(atomic_t *v, int i
)
+
int atomic_cmpxchg(atomic_t *v, int old, int new
)
{
{
+ int ret;
unsigned long flags;
unsigned long flags;
+
spin_lock_irqsave(ATOMIC_HASH(v), flags);
spin_lock_irqsave(ATOMIC_HASH(v), flags);
+ ret = v->counter;
+ if (likely(ret == old))
+ v->counter = new;
- v->counter = i;
+ spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
+ return ret;
+}
+
+int atomic_add_unless(atomic_t *v, int a, int u)
+{
+ int ret;
+ unsigned long flags;
+ spin_lock_irqsave(ATOMIC_HASH(v), flags);
+ ret = v->counter;
+ if (ret != u)
+ v->counter += a;
spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
+ return ret != u;
}
}
-EXPORT_SYMBOL(__atomic_add_return);
-EXPORT_SYMBOL(atomic_set);
+/* Atomic operations are already serializing */
+void atomic_set(atomic_t *v, int i)
+{
+ unsigned long flags;
+ spin_lock_irqsave(ATOMIC_HASH(v), flags);
+ v->counter = i;
+ spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
+}
+EXPORT_SYMBOL(atomic_set);