diff options
author | Joe Perches <joe@perches.com> | 2010-05-24 17:33:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 11:07:03 -0400 |
commit | fc62f2f19edf46c9bdbd1a54725b56b18c43e94f (patch) | |
tree | 1742d181c4c44825df436982cb2f9ea4c386a5f3 /include/linux/kernel.h | |
parent | 4c99000ac47cbd097e62f1b5cafad745622cedc3 (diff) |
kernel.h: add pr_warn for symmetry to dev_warn, netdev_warn
The current logging macros are
pr_<level>, dev_<level>, netdev_<level>, and netif_<level>.
pr_ uses warning, the other use warn.
Standardize these logging macros a bit more by adding pr_warn and
pr_warn_ratelimited.
Right now, there are:
$ for level in emerg alert crit err warn warning notice info ; do \
for prefix in pr dev netdev netif ; do \
echo -n "${prefix}_${level}: `git grep -w "${prefix}_${level}" | wc -l` " ; \
done ; \
echo ; \
done
pr_emerg: 45 dev_emerg: 4 netdev_emerg: 1 netif_emerg: 4
pr_alert: 24 dev_alert: 36 netdev_alert: 1 netif_alert: 6
pr_crit: 24 dev_crit: 22 netdev_crit: 1 netif_crit: 4
pr_err: 2013 dev_err: 8467 netdev_err: 267 netif_err: 240
pr_warn: 0 dev_warn: 1818 netdev_warn: 126 netif_warn: 23
pr_warning: 773 dev_warning: 0 netdev_warning: 0 netif_warning: 0
pr_notice: 148 dev_notice: 111 netdev_notice: 9 netif_notice: 3
pr_info: 1717 dev_info: 3007 netdev_info: 101 netif_info: 85
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index a2e7c32e17e7..ea8490d7020e 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -389,6 +389,7 @@ static inline char *pack_hex_byte(char *buf, u8 byte) | |||
389 | printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) | 389 | printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) |
390 | #define pr_warning(fmt, ...) \ | 390 | #define pr_warning(fmt, ...) \ |
391 | printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) | 391 | printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) |
392 | #define pr_warn pr_warning | ||
392 | #define pr_notice(fmt, ...) \ | 393 | #define pr_notice(fmt, ...) \ |
393 | printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) | 394 | printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) |
394 | #define pr_info(fmt, ...) \ | 395 | #define pr_info(fmt, ...) \ |
@@ -447,6 +448,7 @@ static inline char *pack_hex_byte(char *buf, u8 byte) | |||
447 | printk_ratelimited(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) | 448 | printk_ratelimited(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) |
448 | #define pr_warning_ratelimited(fmt, ...) \ | 449 | #define pr_warning_ratelimited(fmt, ...) \ |
449 | printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) | 450 | printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__) |
451 | #define pr_warn_ratelimited pr_warning_ratelimited | ||
450 | #define pr_notice_ratelimited(fmt, ...) \ | 452 | #define pr_notice_ratelimited(fmt, ...) \ |
451 | printk_ratelimited(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) | 453 | printk_ratelimited(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) |
452 | #define pr_info_ratelimited(fmt, ...) \ | 454 | #define pr_info_ratelimited(fmt, ...) \ |