diff options
Diffstat (limited to 'arch/arm64/include/asm/cmpxchg.h')
| -rw-r--r-- | arch/arm64/include/asm/cmpxchg.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/cmpxchg.h b/arch/arm64/include/asm/cmpxchg.h index 56166d7f4a25..189390ce8653 100644 --- a/arch/arm64/include/asm/cmpxchg.h +++ b/arch/arm64/include/asm/cmpxchg.h | |||
| @@ -29,7 +29,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size | |||
| 29 | switch (size) { | 29 | switch (size) { |
| 30 | case 1: | 30 | case 1: |
| 31 | asm volatile("// __xchg1\n" | 31 | asm volatile("// __xchg1\n" |
| 32 | "1: ldaxrb %w0, %2\n" | 32 | "1: ldxrb %w0, %2\n" |
| 33 | " stlxrb %w1, %w3, %2\n" | 33 | " stlxrb %w1, %w3, %2\n" |
| 34 | " cbnz %w1, 1b\n" | 34 | " cbnz %w1, 1b\n" |
| 35 | : "=&r" (ret), "=&r" (tmp), "+Q" (*(u8 *)ptr) | 35 | : "=&r" (ret), "=&r" (tmp), "+Q" (*(u8 *)ptr) |
| @@ -38,7 +38,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size | |||
| 38 | break; | 38 | break; |
| 39 | case 2: | 39 | case 2: |
| 40 | asm volatile("// __xchg2\n" | 40 | asm volatile("// __xchg2\n" |
| 41 | "1: ldaxrh %w0, %2\n" | 41 | "1: ldxrh %w0, %2\n" |
| 42 | " stlxrh %w1, %w3, %2\n" | 42 | " stlxrh %w1, %w3, %2\n" |
| 43 | " cbnz %w1, 1b\n" | 43 | " cbnz %w1, 1b\n" |
| 44 | : "=&r" (ret), "=&r" (tmp), "+Q" (*(u16 *)ptr) | 44 | : "=&r" (ret), "=&r" (tmp), "+Q" (*(u16 *)ptr) |
| @@ -47,7 +47,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size | |||
| 47 | break; | 47 | break; |
| 48 | case 4: | 48 | case 4: |
| 49 | asm volatile("// __xchg4\n" | 49 | asm volatile("// __xchg4\n" |
| 50 | "1: ldaxr %w0, %2\n" | 50 | "1: ldxr %w0, %2\n" |
| 51 | " stlxr %w1, %w3, %2\n" | 51 | " stlxr %w1, %w3, %2\n" |
| 52 | " cbnz %w1, 1b\n" | 52 | " cbnz %w1, 1b\n" |
| 53 | : "=&r" (ret), "=&r" (tmp), "+Q" (*(u32 *)ptr) | 53 | : "=&r" (ret), "=&r" (tmp), "+Q" (*(u32 *)ptr) |
| @@ -56,7 +56,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size | |||
| 56 | break; | 56 | break; |
| 57 | case 8: | 57 | case 8: |
| 58 | asm volatile("// __xchg8\n" | 58 | asm volatile("// __xchg8\n" |
| 59 | "1: ldaxr %0, %2\n" | 59 | "1: ldxr %0, %2\n" |
| 60 | " stlxr %w1, %3, %2\n" | 60 | " stlxr %w1, %3, %2\n" |
| 61 | " cbnz %w1, 1b\n" | 61 | " cbnz %w1, 1b\n" |
| 62 | : "=&r" (ret), "=&r" (tmp), "+Q" (*(u64 *)ptr) | 62 | : "=&r" (ret), "=&r" (tmp), "+Q" (*(u64 *)ptr) |
| @@ -67,6 +67,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size | |||
| 67 | BUILD_BUG(); | 67 | BUILD_BUG(); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | smp_mb(); | ||
| 70 | return ret; | 71 | return ret; |
| 71 | } | 72 | } |
| 72 | 73 | ||