diff --git a/[refs] b/[refs] index 2090f7a97b97..f00dffd41e92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef1ca236b8d645349ed6569598ae3f6c1b9511c0 +refs/heads/master: 8de6d308bab4f67fcf953562f9f08f9527cad72d diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index fe08a8512ddd..7cf430372f89 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -689,8 +689,7 @@ int schedule_on_each_cpu(work_func_t func) struct work_struct *work = per_cpu_ptr(works, cpu); INIT_WORK(work, func); - set_bit(WORK_STRUCT_PENDING, work_data_bits(work)); - __queue_work(per_cpu_ptr(keventd_wq->cpu_wq, cpu), work); + schedule_work_on(cpu, work); } for_each_online_cpu(cpu) flush_work(per_cpu_ptr(works, cpu));