diff options
author | David S. Miller <davem@davemloft.net> | 2020-08-02 11:02:12 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-08-02 11:02:12 +0300 |
commit | bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004 (patch) | |
tree | 3f03062a9e759dba7b09df0feccbb58b8f7ab4cc /arch/parisc/include/asm/atomic.h | |
parent | 7126bd5c8bcbc015cf89864cf71d750e8f33f924 (diff) | |
parent | ac3a0c8472969a03c0496ae774b3a29eb26c8d5a (diff) | |
download | linux-bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Resolved kernel/bpf/btf.c using instructions from merge commit
69138b34a7248d2396ab85c8652e20c0c39beaba
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/parisc/include/asm/atomic.h')
-rw-r--r-- | arch/parisc/include/asm/atomic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h index 118953d41763..6dd4171c9530 100644 --- a/arch/parisc/include/asm/atomic.h +++ b/arch/parisc/include/asm/atomic.h @@ -212,6 +212,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) { |