diff options
| author |   Will Deacon <will.deacon@arm.com> | 2018-06-19 13:53:09 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2018-06-21 12:52:11 +0200 |
| commit | b22d73c2bd76a6d05256dcd3262d00b5f5af09f4 (patch) | |
| tree | 19d3f359aedfb2692efc0010216c27e1f3790eb1 /arch/openrisc | |
| parent | locking/atomics, asm-generic: Move some macros from <linux/bitops.h> to a new <linux/bits.h> file (diff) | |
| download | linux-dev-b22d73c2bd76a6d05256dcd3262d00b5f5af09f4.tar.xz linux-dev-b22d73c2bd76a6d05256dcd3262d00b5f5af09f4.zip | |
locking/atomics/openrisc: Don't pull in all of <linux/bitops.h> in <asm/cmpxchg.h>
The openrisc implementation of <asm/cmpxchg.h> pulls in <linux/bitops.h>,
so that it can refer to BITS_PER_BYTE. It also transitively relies on
this pulling in <linux/compiler.h> for READ_ONCE().
Replace the #include with <linux/bits.h> and <linux/compiler.h>.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: yamada.masahiro@socionext.com
Link: https://lore.kernel.org/lkml/1529412794-17720-5-git-send-email-will.deacon@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/openrisc')
| -rw-r--r-- | arch/openrisc/include/asm/cmpxchg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/openrisc/include/asm/cmpxchg.h b/arch/openrisc/include/asm/cmpxchg.h index d29f7db53906..f9cd43a39d72 100644 --- a/arch/openrisc/include/asm/cmpxchg.h +++ b/arch/openrisc/include/asm/cmpxchg.h @@ -16,8 +16,9 @@ #ifndef __ASM_OPENRISC_CMPXCHG_H #define __ASM_OPENRISC_CMPXCHG_H +#include <linux/bits.h> +#include <linux/compiler.h> #include <linux/types.h> -#include <linux/bitops.h> #define __HAVE_ARCH_CMPXCHG 1 |