aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/bug.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-01-03 14:49:19 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 08:23:22 -0500
commit27edacac7d97d37ec77779c7da08345298a5d283 (patch)
tree0e54138e1bb1321042310e284f12702385999aa6 /arch/arm/include/asm/bug.h
parent2b97479591117cb0406f95a710cf57bd7d1bca41 (diff)
ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h
BUILD_BUG_ON is defined in linux/kernel.h but that is not included by the asm/bug.h header which uses it. This causes a build error: ...include/linux/mtd/map.h: In function 'inline_map_read': ...include/linux/mtd/map.h:408:3: error: implicit declaration of function 'BUILD_BUG_ON' [-Werror=implicit-function-declaration] The check is not essential and is not present for other architectures, so just remove it. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/bug.h')
-rw-r--r--arch/arm/include/asm/bug.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/bug.h b/arch/arm/include/asm/bug.h
index 9abe7a07d5ac..fac79dceb736 100644
--- a/arch/arm/include/asm/bug.h
+++ b/arch/arm/include/asm/bug.h
@@ -32,7 +32,6 @@
32 32
33#define __BUG(__file, __line, __value) \ 33#define __BUG(__file, __line, __value) \
34do { \ 34do { \
35 BUILD_BUG_ON(sizeof(struct bug_entry) != 12); \
36 asm volatile("1:\t" BUG_INSTR_TYPE #__value "\n" \ 35 asm volatile("1:\t" BUG_INSTR_TYPE #__value "\n" \
37 ".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \ 36 ".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \
38 "2:\t.asciz " #__file "\n" \ 37 "2:\t.asciz " #__file "\n" \