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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
[sfrench/cifs-2.6.git]
/
arch
/
avr32
/
include
/
asm
/
atomic.h
diff --git
a/arch/avr32/include/asm/atomic.h
b/arch/avr32/include/asm/atomic.h
index b131c27ddf5785883a1c28a3078cf6f1bd5a5c0e..bbce6a1c6bb67b873918a32fc68e9a6ea1e5890b 100644
(file)
--- a/
arch/avr32/include/asm/atomic.h
+++ b/
arch/avr32/include/asm/atomic.h
@@
-19,7
+19,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)
/*