summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/bug.h
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2006-12-07 19:09:20 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-12-07 23:38:09 +0100
commit7174d852603ced7a161f47c6e3958073706114a9 (patch)
tree0e8982dbf5df32675cf9f1968ca97384059c945e /include/asm-arm/bug.h
parent[ARM] 4000/1: Osiris: add third serial port in (diff)
downloadlinux-7174d852603ced7a161f47c6e3958073706114a9.tar.xz
linux-7174d852603ced7a161f47c6e3958073706114a9.zip
[ARM] 3983/2: remove unused argument to __bug()
It appears that include/asm-arm/bug.h requires include/linux/stddef.h for the definition of NULL. It seems that stddef.h was always included indirectly in most cases, and that issue was properly fixed a while ago. Then commit 5047f09b56d0bc3c21aec9cb16de60283da645c6 incorrectly reverted change from commit ff10952a547dad934d9ed9afc5cf579ed1ccb53a (bad dwmw2) and the problem recently resurfaced. Because the third argument to __bug() is never used anyway, RMK suggested getting rid of it entirely instead of readding #include <linux/stddef.h> which this patch does. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to '')
-rw-r--r--include/asm-arm/bug.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h
index 0e36fd5d87df..7b62351f097d 100644
--- a/include/asm-arm/bug.h
+++ b/include/asm-arm/bug.h
@@ -4,10 +4,10 @@
#ifdef CONFIG_BUG
#ifdef CONFIG_DEBUG_BUGVERBOSE
-extern void __bug(const char *file, int line, void *data) __attribute__((noreturn));
+extern void __bug(const char *file, int line) __attribute__((noreturn));
/* give file/line information */
-#define BUG() __bug(__FILE__, __LINE__, NULL)
+#define BUG() __bug(__FILE__, __LINE__)
#else