diff options
| author | Will Deacon | 2018-06-01 18:06:21 +0200 |
|---|---|---|
| committer | Yoshinori Sato | 2018-08-22 12:14:20 +0200 |
| commit | 9819d4e47e88af3d7f082af61b55cb381f23f1a1 (patch) | |
| tree | d5ef3783d2dae70aba412ec08a82e029005b495f | |
| parent | h8300: remove unnecessary of_platform_populate call (diff) | |
| download | kernel-qcow2-linux-9819d4e47e88af3d7f082af61b55cb381f23f1a1.tar.gz kernel-qcow2-linux-9819d4e47e88af3d7f082af61b55cb381f23f1a1.tar.xz kernel-qcow2-linux-9819d4e47e88af3d7f082af61b55cb381f23f1a1.zip | |
h8300: Don't include linux/kernel.h in asm/atomic.h
linux/kernel.h isn't needed by asm/atomic.h and will result in circular
dependencies when the asm-generic atomic bitops are built around the
tomic_long_t interface.
Remove the broad include and replace it with linux/compiler.h for
READ_ONCE etc and asm/irqflags.h for arch_local_irq_save etc.
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
| -rw-r--r-- | arch/h8300/include/asm/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/h8300/include/asm/atomic.h b/arch/h8300/include/asm/atomic.h index 941e7554e886..b174dec099bf 100644 --- a/arch/h8300/include/asm/atomic.h +++ b/arch/h8300/include/asm/atomic.h @@ -2,8 +2,10 @@ #ifndef __ARCH_H8300_ATOMIC__ #define __ARCH_H8300_ATOMIC__ +#include <linux/compiler.h> #include <linux/types.h> #include <asm/cmpxchg.h> +#include <asm/irqflags.h> /* * Atomic operations that C can't guarantee us. Useful for @@ -15,8 +17,6 @@ #define atomic_read(v) READ_ONCE((v)->counter) #define atomic_set(v, i) WRITE_ONCE(((v)->counter), (i)) -#include <linux/kernel.h> - #define ATOMIC_OP_RETURN(op, c_op) \ static inline int atomic_##op##_return(int i, atomic_t *v) \ { \ |