summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2018-02-19 11:39:23 +0000
committerWill Deacon <will.deacon@arm.com>2018-03-27 13:14:54 +0100
commite8a2d040fee54606ff62cc1f22e14ad9b2677f15 (patch)
tree22601a218574e3e92e2c3d7520ad81998137c9d2 /arch
parent8a624f145c0d40903cb73090f51797e480bd1295 (diff)
downloadlinux-e8a2d040fee54606ff62cc1f22e14ad9b2677f15.tar.gz
linux-e8a2d040fee54606ff62cc1f22e14ad9b2677f15.tar.bz2
linux-e8a2d040fee54606ff62cc1f22e14ad9b2677f15.zip
arm64: cmpxchg: Include build_bug.h instead of bug.h for BUILD_BUG
Having asm/cmpxchg.h pull in linux/bug.h is problematic because this ends up pulling in the atomic bitops which themselves may be built on top of atomic.h and cmpxchg.h. Instead, just include build_bug.h for the definition of BUILD_BUG. Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/include/asm/cmpxchg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/cmpxchg.h b/arch/arm64/include/asm/cmpxchg.h
index ae852add053d..bc9e07bc6428 100644
--- a/arch/arm64/include/asm/cmpxchg.h
+++ b/arch/arm64/include/asm/cmpxchg.h
@@ -18,7 +18,7 @@
#ifndef __ASM_CMPXCHG_H
#define __ASM_CMPXCHG_H
-#include <linux/bug.h>
+#include <linux/build_bug.h>
#include <asm/atomic.h>
#include <asm/barrier.h>