summaryrefslogtreecommitdiff
path: root/arch/arm64/include/asm/bug.h
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2016-02-16 15:52:34 +0300
committerCatalin Marinas <catalin.marinas@arm.com>2016-02-18 21:16:11 +0300
commit03336b1df9929e5d9c28fd9768948b6151cb046c (patch)
tree9fee8bd05c9d1f1ee3ae92dad266d58aecac6ea5 /arch/arm64/include/asm/bug.h
parent369bc9abf22bf026e8645a4dd746b90649a2f6ee (diff)
downloadlinux-03336b1df9929e5d9c28fd9768948b6151cb046c.tar.xz
arm64: prevent potential circular header dependencies in asm/bug.h
Currently, using BUG_ON() in header files is cumbersome, due to the fact that asm/bug.h transitively includes a lot of other header files, resulting in the actual BUG_ON() invocation appearing before its definition in the preprocessor input. So let's reverse the #include dependency between asm/bug.h and asm/debug-monitors.h, by moving the definition of BUG_BRK_IMM from the latter to the former. Also fix up one user of asm/debug-monitors.h which relied on a transitive include. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/bug.h')
-rw-r--r--arch/arm64/include/asm/bug.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/bug.h b/arch/arm64/include/asm/bug.h
index 4a748ce9ba1a..679d49221998 100644
--- a/arch/arm64/include/asm/bug.h
+++ b/arch/arm64/include/asm/bug.h
@@ -18,7 +18,7 @@
#ifndef _ARCH_ARM64_ASM_BUG_H
#define _ARCH_ARM64_ASM_BUG_H
-#include <asm/debug-monitors.h>
+#define BUG_BRK_IMM 0x800
#ifdef CONFIG_GENERIC_BUG
#define HAVE_ARCH_BUG