diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-04 19:06:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 19:53:53 -0400 |
commit | d7ffef289dd7332a7153e4957db78622b34d2680 (patch) | |
tree | d91471fac7913f46026efeee18df419ddcf12172 /lib | |
parent | 1d88aa441f25811a55c0ed688add108c0a45613e (diff) |
lib/debugobjects.c: convert printk to pr_foo()
Convert all printk to pr_foo() except KERN_DEBUG (see
Documentation/CodingStyle Chapter 13)
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/debugobjects.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/debugobjects.c b/lib/debugobjects.c index e0731c3db706..ea4c7371ff94 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c | |||
@@ -218,7 +218,7 @@ static void debug_objects_oom(void) | |||
218 | unsigned long flags; | 218 | unsigned long flags; |
219 | int i; | 219 | int i; |
220 | 220 | ||
221 | printk(KERN_WARNING "ODEBUG: Out of memory. ODEBUG disabled\n"); | 221 | pr_warn("ODEBUG: Out of memory. ODEBUG disabled\n"); |
222 | 222 | ||
223 | for (i = 0; i < ODEBUG_HASH_SIZE; i++, db++) { | 223 | for (i = 0; i < ODEBUG_HASH_SIZE; i++, db++) { |
224 | raw_spin_lock_irqsave(&db->lock, flags); | 224 | raw_spin_lock_irqsave(&db->lock, flags); |
@@ -292,11 +292,9 @@ static void debug_object_is_on_stack(void *addr, int onstack) | |||
292 | 292 | ||
293 | limit++; | 293 | limit++; |
294 | if (is_on_stack) | 294 | if (is_on_stack) |
295 | printk(KERN_WARNING | 295 | pr_warn("ODEBUG: object is on stack, but not annotated\n"); |
296 | "ODEBUG: object is on stack, but not annotated\n"); | ||
297 | else | 296 | else |
298 | printk(KERN_WARNING | 297 | pr_warn("ODEBUG: object is not on stack, but annotated\n"); |
299 | "ODEBUG: object is not on stack, but annotated\n"); | ||
300 | WARN_ON(1); | 298 | WARN_ON(1); |
301 | } | 299 | } |
302 | 300 | ||
@@ -985,7 +983,7 @@ static void __init debug_objects_selftest(void) | |||
985 | if (check_results(&obj, ODEBUG_STATE_NONE, ++fixups, ++warnings)) | 983 | if (check_results(&obj, ODEBUG_STATE_NONE, ++fixups, ++warnings)) |
986 | goto out; | 984 | goto out; |
987 | #endif | 985 | #endif |
988 | printk(KERN_INFO "ODEBUG: selftest passed\n"); | 986 | pr_info("ODEBUG: selftest passed\n"); |
989 | 987 | ||
990 | out: | 988 | out: |
991 | debug_objects_fixups = oldfixups; | 989 | debug_objects_fixups = oldfixups; |
@@ -1090,7 +1088,7 @@ void __init debug_objects_mem_init(void) | |||
1090 | debug_objects_enabled = 0; | 1088 | debug_objects_enabled = 0; |
1091 | if (obj_cache) | 1089 | if (obj_cache) |
1092 | kmem_cache_destroy(obj_cache); | 1090 | kmem_cache_destroy(obj_cache); |
1093 | printk(KERN_WARNING "ODEBUG: out of memory.\n"); | 1091 | pr_warn("ODEBUG: out of memory.\n"); |
1094 | } else | 1092 | } else |
1095 | debug_objects_selftest(); | 1093 | debug_objects_selftest(); |
1096 | } | 1094 | } |