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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-arm
/
bug.h
diff --git
a/include/asm-arm/bug.h
b/include/asm-arm/bug.h
index
a1afde7
..
7b62351
100644
(file)
--- a/
include/asm-arm/bug.h
+++ b/
include/asm-arm/bug.h
@@
-1,30
+1,24
@@
#ifndef _ASMARM_BUG_H
#define _ASMARM_BUG_H
#ifndef _ASMARM_BUG_H
#define _ASMARM_BUG_H
-#include <linux/config.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) __attribute__((noreturn)
);
/* give file/line information */
/* give file/line information */
-#define BUG() __bug(__FILE__, __LINE__, NULL)
-#define PAGE_BUG(page) __bug(__FILE__, __LINE__, page)
+#define BUG() __bug(__FILE__, __LINE__)
#else
#else
-/* th
ese just cause
an oops */
+/* th
is just causes
an oops */
#define BUG() (*(int *)0 = 0)
#define BUG() (*(int *)0 = 0)
-#define PAGE_BUG(page) (*(int *)0 = 0)
#endif
#endif
-#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
+#define HAVE_ARCH_BUG
+#endif
-#define WARN_ON(condition) do { \
- if (unlikely((condition)!=0)) { \
- printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \
- dump_stack(); \
- } \
-} while (0)
+#include <asm-generic/bug.h>
#endif
#endif