aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/kmemleak.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 25e203474d1b..c1f538e63b1b 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -251,7 +251,7 @@ static void kmemleak_disable(void);
251 * recovered from. Kkmemleak will be disabled and further allocation/freeing 251 * recovered from. Kkmemleak will be disabled and further allocation/freeing
252 * tracing no longer available. 252 * tracing no longer available.
253 */ 253 */
254#define kmemleak_panic(x...) do { \ 254#define kmemleak_stop(x...) do { \
255 kmemleak_warn(x); \ 255 kmemleak_warn(x); \
256 kmemleak_disable(); \ 256 kmemleak_disable(); \
257} while (0) 257} while (0)
@@ -467,8 +467,8 @@ static void create_object(unsigned long ptr, size_t size, int min_count,
467 467
468 object = kmem_cache_alloc(object_cache, gfp & GFP_KMEMLEAK_MASK); 468 object = kmem_cache_alloc(object_cache, gfp & GFP_KMEMLEAK_MASK);
469 if (!object) { 469 if (!object) {
470 kmemleak_panic("kmemleak: Cannot allocate a kmemleak_object " 470 kmemleak_stop("kmemleak: Cannot allocate a kmemleak_object "
471 "structure\n"); 471 "structure\n");
472 return; 472 return;
473 } 473 }
474 474
@@ -527,8 +527,8 @@ static void create_object(unsigned long ptr, size_t size, int min_count,
527 if (node != &object->tree_node) { 527 if (node != &object->tree_node) {
528 unsigned long flags; 528 unsigned long flags;
529 529
530 kmemleak_panic("kmemleak: Cannot insert 0x%lx into the object " 530 kmemleak_stop("kmemleak: Cannot insert 0x%lx into the object "
531 "search tree (already existing)\n", ptr); 531 "search tree (already existing)\n", ptr);
532 object = lookup_object(ptr, 1); 532 object = lookup_object(ptr, 1);
533 spin_lock_irqsave(&object->lock, flags); 533 spin_lock_irqsave(&object->lock, flags);
534 dump_object_info(object); 534 dump_object_info(object);
@@ -699,7 +699,7 @@ static void log_early(int op_type, const void *ptr, size_t size,
699 struct early_log *log; 699 struct early_log *log;
700 700
701 if (crt_early_log >= ARRAY_SIZE(early_log)) { 701 if (crt_early_log >= ARRAY_SIZE(early_log)) {
702 kmemleak_panic("kmemleak: Early log buffer exceeded\n"); 702 kmemleak_stop("kmemleak: Early log buffer exceeded\n");
703 return; 703 return;
704 } 704 }
705 705