diff options
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/barrier.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index e51a8f803f55..d2bcfbed11c3 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h | |||
| @@ -57,12 +57,12 @@ | |||
| 57 | do { \ | 57 | do { \ |
| 58 | compiletime_assert_atomic_type(*p); \ | 58 | compiletime_assert_atomic_type(*p); \ |
| 59 | smp_mb(); \ | 59 | smp_mb(); \ |
| 60 | ACCESS_ONCE(*p) = (v); \ | 60 | WRITE_ONCE(*p, v); \ |
| 61 | } while (0) | 61 | } while (0) |
| 62 | 62 | ||
| 63 | #define smp_load_acquire(p) \ | 63 | #define smp_load_acquire(p) \ |
| 64 | ({ \ | 64 | ({ \ |
| 65 | typeof(*p) ___p1 = ACCESS_ONCE(*p); \ | 65 | typeof(*p) ___p1 = READ_ONCE(*p); \ |
| 66 | compiletime_assert_atomic_type(*p); \ | 66 | compiletime_assert_atomic_type(*p); \ |
| 67 | smp_mb(); \ | 67 | smp_mb(); \ |
| 68 | ___p1; \ | 68 | ___p1; \ |
| @@ -74,12 +74,12 @@ do { \ | |||
| 74 | do { \ | 74 | do { \ |
| 75 | compiletime_assert_atomic_type(*p); \ | 75 | compiletime_assert_atomic_type(*p); \ |
| 76 | barrier(); \ | 76 | barrier(); \ |
| 77 | ACCESS_ONCE(*p) = (v); \ | 77 | WRITE_ONCE(*p, v); \ |
| 78 | } while (0) | 78 | } while (0) |
| 79 | 79 | ||
| 80 | #define smp_load_acquire(p) \ | 80 | #define smp_load_acquire(p) \ |
| 81 | ({ \ | 81 | ({ \ |
| 82 | typeof(*p) ___p1 = ACCESS_ONCE(*p); \ | 82 | typeof(*p) ___p1 = READ_ONCE(*p); \ |
| 83 | compiletime_assert_atomic_type(*p); \ | 83 | compiletime_assert_atomic_type(*p); \ |
| 84 | barrier(); \ | 84 | barrier(); \ |
| 85 | ___p1; \ | 85 | ___p1; \ |