diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-06 17:38:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 19:08:18 -0400 |
commit | f59428ab73ce83adf801d86787c450cef4d9fff9 (patch) | |
tree | 81fc45f1a7f2d24d3452793191d8c1fac198d2d6 /mm | |
parent | c1d4518c4e530fc47180a1858d7d0ad55a069d41 (diff) |
mm/kmemleak-test.c: use pr_fmt for logging
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/kmemleak-test.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/mm/kmemleak-test.c b/mm/kmemleak-test.c index ff0d9779cec8..dcdcadb69533 100644 --- a/mm/kmemleak-test.c +++ b/mm/kmemleak-test.c | |||
@@ -18,6 +18,8 @@ | |||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #define pr_fmt(fmt) "kmemleak: " fmt | ||
22 | |||
21 | #include <linux/init.h> | 23 | #include <linux/init.h> |
22 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
23 | #include <linux/module.h> | 25 | #include <linux/module.h> |
@@ -50,25 +52,25 @@ static int __init kmemleak_test_init(void) | |||
50 | printk(KERN_INFO "Kmemleak testing\n"); | 52 | printk(KERN_INFO "Kmemleak testing\n"); |
51 | 53 | ||
52 | /* make some orphan objects */ | 54 | /* make some orphan objects */ |
53 | pr_info("kmemleak: kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL)); | 55 | pr_info("kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL)); |
54 | pr_info("kmemleak: kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL)); | 56 | pr_info("kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL)); |
55 | pr_info("kmemleak: kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL)); | 57 | pr_info("kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL)); |
56 | pr_info("kmemleak: kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL)); | 58 | pr_info("kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL)); |
57 | pr_info("kmemleak: kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL)); | 59 | pr_info("kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL)); |
58 | pr_info("kmemleak: kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL)); | 60 | pr_info("kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL)); |
59 | pr_info("kmemleak: kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL)); | 61 | pr_info("kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL)); |
60 | pr_info("kmemleak: kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL)); | 62 | pr_info("kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL)); |
61 | #ifndef CONFIG_MODULES | 63 | #ifndef CONFIG_MODULES |
62 | pr_info("kmemleak: kmem_cache_alloc(files_cachep) = %p\n", | 64 | pr_info("kmem_cache_alloc(files_cachep) = %p\n", |
63 | kmem_cache_alloc(files_cachep, GFP_KERNEL)); | 65 | kmem_cache_alloc(files_cachep, GFP_KERNEL)); |
64 | pr_info("kmemleak: kmem_cache_alloc(files_cachep) = %p\n", | 66 | pr_info("kmem_cache_alloc(files_cachep) = %p\n", |
65 | kmem_cache_alloc(files_cachep, GFP_KERNEL)); | 67 | kmem_cache_alloc(files_cachep, GFP_KERNEL)); |
66 | #endif | 68 | #endif |
67 | pr_info("kmemleak: vmalloc(64) = %p\n", vmalloc(64)); | 69 | pr_info("vmalloc(64) = %p\n", vmalloc(64)); |
68 | pr_info("kmemleak: vmalloc(64) = %p\n", vmalloc(64)); | 70 | pr_info("vmalloc(64) = %p\n", vmalloc(64)); |
69 | pr_info("kmemleak: vmalloc(64) = %p\n", vmalloc(64)); | 71 | pr_info("vmalloc(64) = %p\n", vmalloc(64)); |
70 | pr_info("kmemleak: vmalloc(64) = %p\n", vmalloc(64)); | 72 | pr_info("vmalloc(64) = %p\n", vmalloc(64)); |
71 | pr_info("kmemleak: vmalloc(64) = %p\n", vmalloc(64)); | 73 | pr_info("vmalloc(64) = %p\n", vmalloc(64)); |
72 | 74 | ||
73 | /* | 75 | /* |
74 | * Add elements to a list. They should only appear as orphan | 76 | * Add elements to a list. They should only appear as orphan |
@@ -76,7 +78,7 @@ static int __init kmemleak_test_init(void) | |||
76 | */ | 78 | */ |
77 | for (i = 0; i < 10; i++) { | 79 | for (i = 0; i < 10; i++) { |
78 | elem = kzalloc(sizeof(*elem), GFP_KERNEL); | 80 | elem = kzalloc(sizeof(*elem), GFP_KERNEL); |
79 | pr_info("kmemleak: kzalloc(sizeof(*elem)) = %p\n", elem); | 81 | pr_info("kzalloc(sizeof(*elem)) = %p\n", elem); |
80 | if (!elem) | 82 | if (!elem) |
81 | return -ENOMEM; | 83 | return -ENOMEM; |
82 | INIT_LIST_HEAD(&elem->list); | 84 | INIT_LIST_HEAD(&elem->list); |
@@ -85,7 +87,7 @@ static int __init kmemleak_test_init(void) | |||
85 | 87 | ||
86 | for_each_possible_cpu(i) { | 88 | for_each_possible_cpu(i) { |
87 | per_cpu(kmemleak_test_pointer, i) = kmalloc(129, GFP_KERNEL); | 89 | per_cpu(kmemleak_test_pointer, i) = kmalloc(129, GFP_KERNEL); |
88 | pr_info("kmemleak: kmalloc(129) = %p\n", | 90 | pr_info("kmalloc(129) = %p\n", |
89 | per_cpu(kmemleak_test_pointer, i)); | 91 | per_cpu(kmemleak_test_pointer, i)); |
90 | } | 92 | } |
91 | 93 | ||