git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
cris
/
include
/
asm
/
atomic.h
diff --git
a/arch/cris/include/asm/atomic.h
b/arch/cris/include/asm/atomic.h
index
a6aca81
..
88dc9b9
100644
(file)
--- a/
arch/cris/include/asm/atomic.h
+++ b/
arch/cris/include/asm/atomic.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))
/* These should be written in asm but we do it in C for now. */