diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /include/linux/kernel.h | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index d9e75ec7def5..883cd44ff765 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -377,6 +377,15 @@ static inline char *pack_hex_byte(char *buf, u8 byte) | |||
| 377 | #define pr_cont(fmt, ...) \ | 377 | #define pr_cont(fmt, ...) \ |
| 378 | printk(KERN_CONT fmt, ##__VA_ARGS__) | 378 | printk(KERN_CONT fmt, ##__VA_ARGS__) |
| 379 | 379 | ||
| 380 | /* pr_devel() should produce zero code unless DEBUG is defined */ | ||
| 381 | #ifdef DEBUG | ||
| 382 | #define pr_devel(fmt, ...) \ | ||
| 383 | printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) | ||
| 384 | #else | ||
| 385 | #define pr_devel(fmt, ...) \ | ||
| 386 | ({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; }) | ||
| 387 | #endif | ||
| 388 | |||
| 380 | /* If you are writing a driver, please use dev_dbg instead */ | 389 | /* If you are writing a driver, please use dev_dbg instead */ |
| 381 | #if defined(DEBUG) | 390 | #if defined(DEBUG) |
| 382 | #define pr_debug(fmt, ...) \ | 391 | #define pr_debug(fmt, ...) \ |