projects
/
powerpc.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/herbert/crypto-2.6
[powerpc.git]
/
include
/
asm-ia64
/
atomic.h
diff --git
a/include/asm-ia64/atomic.h
b/include/asm-ia64/atomic.h
index
1fc3b83
..
50c2b83
100644
(file)
--- a/
include/asm-ia64/atomic.h
+++ b/
include/asm-ia64/atomic.h
@@
-55,7
+55,7
@@
ia64_atomic64_add (__s64 i, atomic64_t *v)
do {
CMPXCHG_BUGCHECK(v);
do {
CMPXCHG_BUGCHECK(v);
- old = atomic_read(v);
+ old = atomic
64
_read(v);
new = old + i;
} while (ia64_cmpxchg(acq, v, old, new, sizeof(atomic64_t)) != old);
return new;
new = old + i;
} while (ia64_cmpxchg(acq, v, old, new, sizeof(atomic64_t)) != old);
return new;
@@
-83,7
+83,7
@@
ia64_atomic64_sub (__s64 i, atomic64_t *v)
do {
CMPXCHG_BUGCHECK(v);
do {
CMPXCHG_BUGCHECK(v);
- old = atomic_read(v);
+ old = atomic
64
_read(v);
new = old - i;
} while (ia64_cmpxchg(acq, v, old, new, sizeof(atomic64_t)) != old);
return new;
new = old - i;
} while (ia64_cmpxchg(acq, v, old, new, sizeof(atomic64_t)) != old);
return new;