mm/kmemleak-test.c: use pr_fmt for logging
authorFabian Frederick <fabf@skynet.be>
Fri, 6 Jun 2014 21:38:26 +0000 (14:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2014 23:08:18 +0000 (16:08 -0700)
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>
mm/kmemleak-test.c

index ff0d977..dcdcadb 100644 (file)
@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#define pr_fmt(fmt) "kmemleak: " fmt
+
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -50,25 +52,25 @@ static int __init kmemleak_test_init(void)
        printk(KERN_INFO "Kmemleak testing\n");
 
        /* make some orphan objects */
-       pr_info("kmemleak: kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL));
-       pr_info("kmemleak: kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL));
-       pr_info("kmemleak: kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL));
-       pr_info("kmemleak: kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL));
-       pr_info("kmemleak: kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL));
-       pr_info("kmemleak: kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL));
-       pr_info("kmemleak: kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL));
-       pr_info("kmemleak: kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL));
+       pr_info("kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL));
+       pr_info("kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL));
+       pr_info("kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL));
+       pr_info("kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL));
+       pr_info("kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL));
+       pr_info("kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL));
+       pr_info("kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL));
+       pr_info("kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL));
 #ifndef CONFIG_MODULES
-       pr_info("kmemleak: kmem_cache_alloc(files_cachep) = %p\n",
+       pr_info("kmem_cache_alloc(files_cachep) = %p\n",
                kmem_cache_alloc(files_cachep, GFP_KERNEL));
-       pr_info("kmemleak: kmem_cache_alloc(files_cachep) = %p\n",
+       pr_info("kmem_cache_alloc(files_cachep) = %p\n",
                kmem_cache_alloc(files_cachep, GFP_KERNEL));
 #endif
-       pr_info("kmemleak: vmalloc(64) = %p\n", vmalloc(64));
-       pr_info("kmemleak: vmalloc(64) = %p\n", vmalloc(64));
-       pr_info("kmemleak: vmalloc(64) = %p\n", vmalloc(64));
-       pr_info("kmemleak: vmalloc(64) = %p\n", vmalloc(64));
-       pr_info("kmemleak: vmalloc(64) = %p\n", vmalloc(64));
+       pr_info("vmalloc(64) = %p\n", vmalloc(64));
+       pr_info("vmalloc(64) = %p\n", vmalloc(64));
+       pr_info("vmalloc(64) = %p\n", vmalloc(64));
+       pr_info("vmalloc(64) = %p\n", vmalloc(64));
+       pr_info("vmalloc(64) = %p\n", vmalloc(64));
 
        /*
         * Add elements to a list. They should only appear as orphan
@@ -76,7 +78,7 @@ static int __init kmemleak_test_init(void)
         */
        for (i = 0; i < 10; i++) {
                elem = kzalloc(sizeof(*elem), GFP_KERNEL);
-               pr_info("kmemleak: kzalloc(sizeof(*elem)) = %p\n", elem);
+               pr_info("kzalloc(sizeof(*elem)) = %p\n", elem);
                if (!elem)
                        return -ENOMEM;
                INIT_LIST_HEAD(&elem->list);
@@ -85,7 +87,7 @@ static int __init kmemleak_test_init(void)
 
        for_each_possible_cpu(i) {
                per_cpu(kmemleak_test_pointer, i) = kmalloc(129, GFP_KERNEL);
-               pr_info("kmemleak: kmalloc(129) = %p\n",
+               pr_info("kmalloc(129) = %p\n",
                        per_cpu(kmemleak_test_pointer, i));
        }