diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 19:22:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 19:22:55 -0700 |
| commit | 513de477a09f770e42ad042bf830565d9c73a158 (patch) | |
| tree | 5a9924a8bffb4777d3df34ce2b05d564f3b567b6 /lib | |
| parent | 62c8d922783a0fa41a9b4ca004f0467d6ca9be48 (diff) | |
| parent | 3340808cf04faad7b87d6c6e13800825e5552b51 (diff) | |
| download | linux-3.10-513de477a09f770e42ad042bf830565d9c73a158.tar.gz linux-3.10-513de477a09f770e42ad042bf830565d9c73a158.tar.bz2 linux-3.10-513de477a09f770e42ad042bf830565d9c73a158.zip | |
Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core/debugobjects changes from Ingo Molnar:
"Not much happened: it includes a cleanup and an irq latency reduction
fixlet."
* 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
debugobjects: Fill_pool() returns void now
debugobjects: printk with irqs enabled
debugobjects: Remove unused return value from fill_pool()
Diffstat (limited to 'lib')
| -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 0ab9ae8057f..d11808ca4bc 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) { |