Merge branch 'locking/header'

2020-07-29 16:14:21 +02:00
parent c84d53051f 459e39538e
commit f05d67179d
22 changed files with 3 additions and 42 deletions
--- a/arch/mips/include/asm/atomic.h
+++ b/arch/mips/include/asm/atomic.h
@@ -45,7 +45,6 @@ static __always_inline type pfx##_xchg(pfx##_t *v, type n)		\
 	return xchg(&v->counter, n);					\
 }

-#define ATOMIC_INIT(i)		{ (i) }
 ATOMIC_OPS(atomic, int)

 #ifdef CONFIG_64BIT