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 branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend...
[sfrench/cifs-2.6.git]
/
arch
/
m68k
/
include
/
asm
/
atomic_no.h
diff --git
a/arch/m68k/include/asm/atomic_no.h
b/arch/m68k/include/asm/atomic_no.h
index 5674cb9449bd81278fa67e319a0b66abca0efd39..289310c63a8a5c361fe2f659205bd827b9889e7c 100644
(file)
--- a/
arch/m68k/include/asm/atomic_no.h
+++ b/
arch/m68k/include/asm/atomic_no.h
@@
-15,7
+15,7
@@
#define ATOMIC_INIT(i) { (i) }
-#define atomic_read(v) ((v)->counter)
+#define atomic_read(v) (
*(volatile int *)&
(v)->counter)
#define atomic_set(v, i) (((v)->counter) = i)
static __inline__ void atomic_add(int i, atomic_t *v)