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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
asm-generic
/
bug.h
diff --git
a/include/asm-generic/bug.h
b/include/asm-generic/bug.h
index
3e8dc3e
..
cce17f9
100644
(file)
--- a/
include/asm-generic/bug.h
+++ b/
include/asm-generic/bug.h
@@
-11,7
+11,7
@@
extern const char *print_tainted(void);
#ifdef CONFIG_BUG
#ifndef HAVE_ARCH_BUG
#define BUG() do { \
#ifdef CONFIG_BUG
#ifndef HAVE_ARCH_BUG
#define BUG() do { \
- printk("
kernel BUG at %s:%d! (%s)\n", __FILE__, __LINE
__, print_tainted()); \
+ printk("
BUG: failure at %s:%d/%s()! (%s)\n", __FILE__, __LINE__, __FUNCTION
__, print_tainted()); \
panic("BUG!"); \
} while (0)
#endif
panic("BUG!"); \
} while (0)
#endif
@@
-23,7
+23,7
@@
extern const char *print_tainted(void);
#ifndef HAVE_ARCH_WARN_ON
#define WARN_ON(condition) do { \
if (unlikely((condition)!=0)) { \
#ifndef HAVE_ARCH_WARN_ON
#define WARN_ON(condition) do { \
if (unlikely((condition)!=0)) { \
- printk("B
adness in %s at %s:%d (%s)\n", __FUNCTION__, __FILE__, __LINE
__, print_tainted()); \
+ printk("B
UG: warning at %s:%d/%s() (%s)\n", __FILE__, __LINE__, __FUNCTION
__, print_tainted()); \
dump_stack(); \
} \
} while (0)
dump_stack(); \
} \
} while (0)