diff options
| author | Colin Cross <ccross@android.com> | 2011-07-12 20:11:00 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-07-12 20:11:00 -0700 |
| commit | 2340c679cabc5477598ee3c9c2044ec8893d42fd (patch) | |
| tree | 2cf2848bea005b9d807710f23dc5519191ca8215 /lib | |
| parent | 9a489d92af45a7d7c1bba9e0803f73f95d2fd13c (diff) | |
| parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) | |
| download | kernel_samsung_espresso10-2340c679cabc5477598ee3c9c2044ec8893d42fd.zip kernel_samsung_espresso10-2340c679cabc5477598ee3c9c2044ec8893d42fd.tar.gz kernel_samsung_espresso10-2340c679cabc5477598ee3c9c2044ec8893d42fd.tar.bz2 | |
Merge commit 'v3.0-rc7' into linux-omap-3.0
Diffstat (limited to 'lib')
| -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 9d86e45..a78b7c6 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--; |