diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-11 22:41:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-11 22:41:14 +0000 |
| commit | fae4bb16eec6425bd37495d8fa7d70bde98b368b (patch) | |
| tree | 8abca76202ce58a98373cbdc70aa8f9b1f4bc5d4 /arch | |
| parent | c3a3fb845b3d12229184b81a7f773c7f81d27009 (diff) | |
| parent | 26b545351664d9ec3a7f9aff4100a05558c8db84 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/warnings' into linux-linaro-lsk
Conflicts:
arch/arm64/include/asm/cmpxchg.h
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/cmpxchg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/cmpxchg.h b/arch/arm64/include/asm/cmpxchg.h index 8551fbf5d46..68d7c932a9c 100644 --- a/arch/arm64/include/asm/cmpxchg.h +++ b/arch/arm64/include/asm/cmpxchg.h @@ -162,7 +162,7 @@ static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old, ({ \ __typeof__(*(ptr)) __ret; \ __ret = (__typeof__(*(ptr))) \ - __cmpxchg((ptr), (unsigned long)(o), (unsigned long)(n), \ + __cmpxchg_mb((ptr), (unsigned long)(o), (unsigned long)(n), \ sizeof(*(ptr))); \ __ret; \ }) @@ -171,7 +171,7 @@ static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old, ({ \ __typeof__(*(ptr)) __ret; \ __ret = (__typeof__(*(ptr))) \ - __cmpxchg_local((ptr), (unsigned long)(o), \ + __cmpxchg((ptr), (unsigned long)(o), \ (unsigned long)(n), sizeof(*(ptr))); \ __ret; \ }) |