diff options
| author | Ingo Molnar | 2015-06-03 10:07:35 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-06-03 10:07:35 +0200 |
| commit | 71966f3a0b24b408a87a0c475262638fbb71da99 (patch) | |
| tree | ce900472dd12f03fd6d0e764ea9f5a647471689d /arch/s390 | |
| parent | Merge branches 'x86/mm', 'x86/build', 'x86/apic' and 'x86/platform' into x86/... (diff) | |
| parent | lockdep: Do not break user-visible string (diff) | |
| download | kernel-qcow2-linux-71966f3a0b24b408a87a0c475262638fbb71da99.tar.gz kernel-qcow2-linux-71966f3a0b24b408a87a0c475262638fbb71da99.tar.xz kernel-qcow2-linux-71966f3a0b24b408a87a0c475262638fbb71da99.zip | |
Merge branch 'locking/core' into x86/core, to prepare for dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/barrier.h | 2 | ||||
| -rw-r--r-- | arch/s390/include/asm/cmpxchg.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h index 8d724718ec21..e6f8615a11eb 100644 --- a/arch/s390/include/asm/barrier.h +++ b/arch/s390/include/asm/barrier.h @@ -36,7 +36,7 @@ #define smp_mb__before_atomic() smp_mb() #define smp_mb__after_atomic() smp_mb() -#define set_mb(var, value) do { var = value; mb(); } while (0) +#define smp_store_mb(var, value) do { WRITE_ONCE(var, value); mb(); } while (0) #define smp_store_release(p, v) \ do { \ diff --git a/arch/s390/include/asm/cmpxchg.h b/arch/s390/include/asm/cmpxchg.h index 4eadec466b8c..411464f4c97a 100644 --- a/arch/s390/include/asm/cmpxchg.h +++ b/arch/s390/include/asm/cmpxchg.h @@ -32,8 +32,6 @@ __old; \ }) -#define __HAVE_ARCH_CMPXCHG - #define __cmpxchg_double_op(p1, p2, o1, o2, n1, n2, insn) \ ({ \ register __typeof__(*(p1)) __old1 asm("2") = (o1); \ |