git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
frv
/
include
/
asm
/
atomic.h
diff --git
a/arch/frv/include/asm/atomic.h
b/arch/frv/include/asm/atomic.h
index f6c3a16901011b9fc6600a6a5c26ae42b004c2a8..102190a61d65a1fb28f4775309a167355cebcca7 100644
(file)
--- a/
arch/frv/include/asm/atomic.h
+++ b/
arch/frv/include/asm/atomic.h
@@
-31,7
+31,7
@@
*/
#define ATOMIC_INIT(i) { (i) }
-#define atomic_read(v)
(*(volatile int *)&
(v)->counter)
+#define atomic_read(v)
ACCESS_ONCE(
(v)->counter)
#define atomic_set(v, i) (((v)->counter) = (i))
#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS