mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: net/bluetooth/l2cap_core.c
This commit is contained in:
commit
6a7ebdf2fd
350 changed files with 26458 additions and 1786 deletions
|
|
@ -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--;
|
||||
|
|
|
|||
Loading…
Reference in a new issue