diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 01:20:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 01:20:39 +0300 |
| commit | 59766edc79da0583eff7d0a9e1049b0d3c5676b0 (patch) | |
| tree | 0a8261248b89c54667f7eeb367bbcddde5c694d4 /arch/mn10300/include/asm/atomic.h | |
| parent | 2990821d0e38d2bfc556ad39d709b5f8a83c2ebd (diff) | |
| parent | af794206542e03d62138a107ee0ffb5e7d631881 (diff) | |
| download | linux-59766edc79da0583eff7d0a9e1049b0d3c5676b0.tar.xz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
MN10300: atomic_read() should ensure it emits a load
MN10300: The SMP_ICACHE_INV_FLUSH_RANGE IPI command does not exist
MN10300: Proper use of macros get_user() in the case of incremented pointers
Diffstat (limited to 'arch/mn10300/include/asm/atomic.h')
| -rw-r--r-- | arch/mn10300/include/asm/atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/include/asm/atomic.h b/arch/mn10300/include/asm/atomic.h index 92d2f9298e38..9d773a639513 100644 --- a/arch/mn10300/include/asm/atomic.h +++ b/arch/mn10300/include/asm/atomic.h @@ -139,7 +139,7 @@ static inline unsigned long __cmpxchg(volatile unsigned long *m, * Atomically reads the value of @v. Note that the guaranteed * useful range of an atomic_t is only 24 bits. */ -#define atomic_read(v) ((v)->counter) +#define atomic_read(v) (ACCESS_ONCE((v)->counter)) /** * atomic_set - set atomic variable |