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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-sh64
/
bug.h
diff --git
a/include/asm-sh64/bug.h
b/include/asm-sh64/bug.h
index
5d659ec
..
f3a9c92
100644
(file)
--- a/
include/asm-sh64/bug.h
+++ b/
include/asm-sh64/bug.h
@@
-1,8
+1,7
@@
#ifndef __ASM_SH64_BUG_H
#define __ASM_SH64_BUG_H
#ifndef __ASM_SH64_BUG_H
#define __ASM_SH64_BUG_H
-#include <linux/config.h>
-
+#ifdef CONFIG_BUG
/*
* Tell the user there is some problem, then force a segfault (in process
* context) or a panic (interrupt context).
/*
* Tell the user there is some problem, then force a segfault (in process
* context) or a panic (interrupt context).
@@
-12,17
+11,9
@@
*(volatile int *)0 = 0; \
} while (0)
*(volatile int *)0 = 0; \
} while (0)
-#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 /* __ASM_SH64_BUG_H */
#endif /* __ASM_SH64_BUG_H */
-