From: Will Deacon <will.deacon@arm.com>
Date: Mon, 19 Feb 2018 11:39:23 +0000 (+0000)
Subject: arm64: cmpxchg: Include build_bug.h instead of bug.h for BUILD_BUG
X-Git-Tag: v4.17-rc1~130^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e8a2d040fee54606ff62cc1f22e14ad9b2677f15;p=linux.git

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>
---

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>