diff options
| author |   Will Deacon <will.deacon@arm.com> | 2018-06-19 13:53:10 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2018-06-21 12:52:11 +0200 |
| commit | 1c2672b49aa49d4fdc69d4ebbaf959264051e34a (patch) | |
| tree | 9d4a437b1d104c9a2b054ae3b6730730b4251aa0 /arch/sh/include | |
| parent | locking/atomics/openrisc: Don't pull in all of <linux/bitops.h> in <asm/cmpxchg.h> (diff) | |
| download | linux-dev-1c2672b49aa49d4fdc69d4ebbaf959264051e34a.tar.xz linux-dev-1c2672b49aa49d4fdc69d4ebbaf959264051e34a.zip | |
locking/atomics/sh: Don't pull in all of <linux/bitops.h> in <asm/cmpxchg-xchg.h>
The sh implementation of <asm/cmpxchg-xchg.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-6-git-send-email-will.deacon@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/cmpxchg-xchg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/include/asm/cmpxchg-xchg.h b/arch/sh/include/asm/cmpxchg-xchg.h index 1e881f5db659..593a9704782b 100644 --- a/arch/sh/include/asm/cmpxchg-xchg.h +++ b/arch/sh/include/asm/cmpxchg-xchg.h @@ -8,7 +8,8 @@ * This work is licensed under the terms of the GNU GPL, version 2. See the * file "COPYING" in the main directory of this archive for more details. */ -#include <linux/bitops.h> +#include <linux/bits.h> +#include <linux/compiler.h> #include <asm/byteorder.h> /* |