diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2009-06-17 18:29:03 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2009-06-17 18:29:03 +0100 |
| commit | 000814f44e56122ea22e1f1422e16df36a1bb396 (patch) | |
| tree | 97a5a5cbf81045eadb7d0f03a700999d17f4af97 | |
| parent | 216c04b0d848fa3db04fc240d9cdc1d2cc1e9574 (diff) | |
| download | linux-3.10-000814f44e56122ea22e1f1422e16df36a1bb396.tar.gz linux-3.10-000814f44e56122ea22e1f1422e16df36a1bb396.tar.bz2 linux-3.10-000814f44e56122ea22e1f1422e16df36a1bb396.zip | |
kmemleak: Rename kmemleak_panic to kmemleak_stop
This is to avoid the confusion created by the "panic" word.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
| -rw-r--r-- | mm/kmemleak.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 25e203474d1..c1f538e63b1 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -251,7 +251,7 @@ static void kmemleak_disable(void); * recovered from. Kkmemleak will be disabled and further allocation/freeing * tracing no longer available. */ -#define kmemleak_panic(x...) do { \ +#define kmemleak_stop(x...) do { \ kmemleak_warn(x); \ kmemleak_disable(); \ } while (0) @@ -467,8 +467,8 @@ static void create_object(unsigned long ptr, size_t size, int min_count, object = kmem_cache_alloc(object_cache, gfp & GFP_KMEMLEAK_MASK); if (!object) { - kmemleak_panic("kmemleak: Cannot allocate a kmemleak_object " - "structure\n"); + kmemleak_stop("kmemleak: Cannot allocate a kmemleak_object " + "structure\n"); return; } @@ -527,8 +527,8 @@ static void create_object(unsigned long ptr, size_t size, int min_count, if (node != &object->tree_node) { unsigned long flags; - kmemleak_panic("kmemleak: Cannot insert 0x%lx into the object " - "search tree (already existing)\n", ptr); + kmemleak_stop("kmemleak: Cannot insert 0x%lx into the object " + "search tree (already existing)\n", ptr); object = lookup_object(ptr, 1); spin_lock_irqsave(&object->lock, flags); dump_object_info(object); @@ -699,7 +699,7 @@ static void log_early(int op_type, const void *ptr, size_t size, struct early_log *log; if (crt_early_log >= ARRAY_SIZE(early_log)) { - kmemleak_panic("kmemleak: Early log buffer exceeded\n"); + kmemleak_stop("kmemleak: Early log buffer exceeded\n"); return; } |