diff options
| author | Grant Likely <[email protected]> | 2011-07-15 20:11:34 -0600 | 
|---|---|---|
| committer | Grant Likely <[email protected]> | 2011-07-15 20:11:34 -0600 | 
| commit | 8c11642a50555e584774737f7c296f9aece310cf (patch) | |
| tree | 1ff8dfaf05479593ef2c50378a68dfc6aec495a5 /lib/debugobjects.c | |
| parent | 5d10302f46df1d9a85c34ea97f9b6c29e414482e (diff) | |
| parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) | |
Merge commit 'v3.0-rc7' into devicetree/next
Diffstat (limited to 'lib/debugobjects.c')
| -rw-r--r-- | lib/debugobjects.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/lib/debugobjects.c b/lib/debugobjects.c index 9d86e45086f5..a78b7c6e042c 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c @@ -198,7 +198,7 @@ static void free_object(struct debug_obj *obj)  	 * initialized:  	 */  	if (obj_pool_free > ODEBUG_POOL_SIZE && obj_cache) -		sched = !work_pending(&debug_obj_work); +		sched = keventd_up() && !work_pending(&debug_obj_work);  	hlist_add_head(&obj->node, &obj_pool);  	obj_pool_free++;  	obj_pool_used--; |