git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-arm
/
bug.h
diff --git
a/include/asm-arm/bug.h
b/include/asm-arm/bug.h
index
5e91b90
..
5ab8216
100644
(file)
--- a/
include/asm-arm/bug.h
+++ b/
include/asm-arm/bug.h
@@
-2,9
+2,11
@@
#define _ASMARM_BUG_H
#include <linux/config.h>
#define _ASMARM_BUG_H
#include <linux/config.h>
+#include <linux/stddef.h>
+#ifdef CONFIG_BUG
#ifdef CONFIG_DEBUG_BUGVERBOSE
#ifdef CONFIG_DEBUG_BUGVERBOSE
-extern vo
latile void __bug(const char *file, int line, void *data
);
+extern vo
id __bug(const char *file, int line, void *data) __attribute__((noreturn)
);
/* give file/line information */
#define BUG() __bug(__FILE__, __LINE__, NULL)
/* give file/line information */
#define BUG() __bug(__FILE__, __LINE__, NULL)
@@
-17,6
+19,8
@@
extern volatile void __bug(const char *file, int line, void *data);
#endif
#define HAVE_ARCH_BUG
#endif
#define HAVE_ARCH_BUG
+#endif
+
#include <asm-generic/bug.h>
#endif
#include <asm-generic/bug.h>
#endif