summaryrefslogtreecommitdiffstats
path: root/arch/parisc/include/asm/atomic.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-07-31 11:58:05 +0200
committerIngo Molnar <mingo@kernel.org>2020-07-31 12:16:09 +0200
commit28cff52eaeb5c43144d0c730080aff0d6bc1e5d5 (patch)
treea55a41b99503a5c96314908b9f30db37e301d64d /arch/parisc/include/asm/atomic.h
parentkcsan: Improve IRQ state trace reporting (diff)
parentMerge tag 'drm-fixes-2020-07-31' of git://anongit.freedesktop.org/drm/drm (diff)
downloadlinux-28cff52eaeb5c43144d0c730080aff0d6bc1e5d5.tar.xz
linux-28cff52eaeb5c43144d0c730080aff0d6bc1e5d5.zip
Merge branch 'linus' into locking/core, to resolve conflict
Conflicts: arch/arm/include/asm/percpu.h As Stephen Rothwell noted, there's a conflict between this commit in locking/core: a21ee6055c30 ("lockdep: Change hardirq{s_enabled,_context} to per-cpu variables") and this fresh upstream commit: aa54ea903abb ("ARM: percpu.h: fix build error") a21ee6055c30 is a simpler solution to the dependency problem and doesn't further increase header hell - so this conflict resolution effectively reverts aa54ea903abb and uses the a21ee6055c30 solution. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/parisc/include/asm/atomic.h')
-rw-r--r--arch/parisc/include/asm/atomic.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
index f960e2f32b1b..03862320f779 100644
--- a/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
@@ -210,6 +210,8 @@ atomic64_set(atomic64_t *v, s64 i)
_atomic_spin_unlock_irqrestore(v, flags);
}
+#define atomic64_set_release(v, i) atomic64_set((v), (i))
+
static __inline__ s64
atomic64_read(const atomic64_t *v)
{