The following commit has been merged into the locking/core branch of tip: Commit-ID: 89eb78d542394a8461164009272ea654357795ad Gitweb: https://git.kernel.org/tip/89eb78d542394a8461164009272ea654357795ad Author: Mark Rutland <mark.rutland@xxxxxxx> AuthorDate: Tue, 25 May 2021 15:02:06 +01:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Wed, 26 May 2021 13:20:50 +02:00 locking/atomic: atomic: remove redundant include Since commit: 560cb12a4080a48b ("locking,arch: Rewrite generic atomic support") ... we conditionally include <linux/irqflags.h> before defining atomics using locking, and hence do not need to do so unconditionally later in the header. This patch removes the redundant include. Signed-off-by: Mark Rutland <mark.rutland@xxxxxxx> Cc: Boqun Feng <boqun.feng@xxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Will Deacon <will@xxxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20210525140232.53872-8-mark.rutland@xxxxxxx --- include/asm-generic/atomic.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h index ebacbc6..d4bf803 100644 --- a/include/asm-generic/atomic.h +++ b/include/asm-generic/atomic.h @@ -143,8 +143,6 @@ ATOMIC_OP(xor, ^) #define atomic_set(v, i) WRITE_ONCE(((v)->counter), (i)) -#include <linux/irqflags.h> - static inline void atomic_add(int i, atomic_t *v) { atomic_add_return(i, v);
![]() |