diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-03 08:07:35 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-03 08:07:35 (GMT) |
| commit | 71966f3a0b24b408a87a0c475262638fbb71da99 (patch) | |
| tree | ce900472dd12f03fd6d0e764ea9f5a647471689d /arch/ia64/include | |
| parent | 34e7724c0767f04f6199f2bd7232e9ab1207e1df (diff) | |
| parent | 92ae18371cb1abb4e186dd9d48de2bb0d9bba626 (diff) | |
| download | linux-71966f3a0b24b408a87a0c475262638fbb71da99.tar.xz | |
Merge branch 'locking/core' into x86/core, to prepare for dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/ia64/include')
| -rw-r--r-- | arch/ia64/include/asm/barrier.h | 7 | ||||
| -rw-r--r-- | arch/ia64/include/uapi/asm/cmpxchg.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h index f6769eb..843ba43 100644 --- a/arch/ia64/include/asm/barrier.h +++ b/arch/ia64/include/asm/barrier.h @@ -77,12 +77,7 @@ do { \ ___p1; \ }) -/* - * XXX check on this ---I suspect what Linus really wants here is - * acquire vs release semantics but we can't discuss this stuff with - * Linus just yet. Grrr... - */ -#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) /* * The group barrier in front of the rsm & ssm are necessary to ensure diff --git a/arch/ia64/include/uapi/asm/cmpxchg.h b/arch/ia64/include/uapi/asm/cmpxchg.h index f35109b..a0e3620 100644 --- a/arch/ia64/include/uapi/asm/cmpxchg.h +++ b/arch/ia64/include/uapi/asm/cmpxchg.h @@ -61,8 +61,6 @@ extern void ia64_xchg_called_with_bad_pointer(void); * indicated by comparing RETURN with OLD. */ -#define __HAVE_ARCH_CMPXCHG 1 - /* * This function doesn't exist, so you'll get a linker error * if something tries to do an invalid cmpxchg(). |