diff options
| author | Inki Dae <inki.dae@samsung.com> | 2012-07-27 11:09:46 +0900 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2012-07-27 11:09:46 +0900 |
| commit | faa3d77749ad30d2e1c48e2e4363b9c4889aca27 (patch) | |
| tree | a3b61011d6861704470a821d5136d1479d7ee2a2 /lib/debugobjects.c | |
| parent | e728519ea853a4f693577decfd2f5eb7e4a3a20d (diff) | |
| parent | 98c7b42375011ec37251e6fc85a0471cfe499eea (diff) | |
| download | linux-faa3d77749ad30d2e1c48e2e4363b9c4889aca27.tar.gz linux-faa3d77749ad30d2e1c48e2e4363b9c4889aca27.zip | |
Merge branch 'drm-next' of ../main_line/linux-drm into dave-drm-next
Diffstat (limited to 'lib/debugobjects.c')
| -rw-r--r-- | lib/debugobjects.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/debugobjects.c b/lib/debugobjects.c index 0ab9ae8057f0..d11808ca4bc4 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c @@ -79,30 +79,29 @@ static const char *obj_states[ODEBUG_STATE_MAX] = { [ODEBUG_STATE_NOTAVAILABLE] = "not available", }; -static int fill_pool(void) +static void fill_pool(void) { gfp_t gfp = GFP_ATOMIC | __GFP_NORETRY | __GFP_NOWARN; struct debug_obj *new; unsigned long flags; if (likely(obj_pool_free >= ODEBUG_POOL_MIN_LEVEL)) - return obj_pool_free; + return; if (unlikely(!obj_cache)) - return obj_pool_free; + return; while (obj_pool_free < ODEBUG_POOL_MIN_LEVEL) { new = kmem_cache_zalloc(obj_cache, gfp); if (!new) - return obj_pool_free; + return; raw_spin_lock_irqsave(&pool_lock, flags); hlist_add_head(&new->node, &obj_pool); obj_pool_free++; raw_spin_unlock_irqrestore(&pool_lock, flags); } - return obj_pool_free; } /* @@ -1052,10 +1051,10 @@ static int __init debug_objects_replace_static_objects(void) cnt++; } } + local_irq_enable(); printk(KERN_DEBUG "ODEBUG: %d of %d active objects replaced\n", cnt, obj_pool_used); - local_irq_enable(); return 0; free: hlist_for_each_entry_safe(obj, node, tmp, &objects, node) { |