diff options
author | Michal Marek <mmarek@suse.cz> | 2014-01-02 08:02:06 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2014-01-02 08:02:06 -0500 |
commit | 37e2c2a775fc887acd1432908478dfd532f7f00f (patch) | |
tree | e51ebc699d8e262fd47e0913be6a711cb1a7b565 /lib/debugobjects.c | |
parent | 1c8ddae09f4c102b97c9086cc70347e89468a547 (diff) | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) |
Merge commit v3.13-rc1 into kbuild/misc
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 bf2c8b1043d8..e0731c3db706 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c | |||
@@ -196,7 +196,7 @@ static void free_object(struct debug_obj *obj) | |||
196 | * initialized: | 196 | * initialized: |
197 | */ | 197 | */ |
198 | if (obj_pool_free > ODEBUG_POOL_SIZE && obj_cache) | 198 | if (obj_pool_free > ODEBUG_POOL_SIZE && obj_cache) |
199 | sched = keventd_up() && !work_pending(&debug_obj_work); | 199 | sched = keventd_up(); |
200 | hlist_add_head(&obj->node, &obj_pool); | 200 | hlist_add_head(&obj->node, &obj_pool); |
201 | obj_pool_free++; | 201 | obj_pool_free++; |
202 | obj_pool_used--; | 202 | obj_pool_used--; |