1 files changed, 7 insertions, 5 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 742cbbe49bdc..a3da07c5af28 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -233,7 +233,7 @@ static void delayed_work_timer_fn(unsigned long __data)
 /**
  * queue_delayed_work - queue work on a workqueue after delay
  * @wq: workqueue to use
- * @work: delayable work to queue
+ * @dwork: delayable work to queue
  * @delay: number of jiffies to wait before queueing
  *
  * Returns 0 if @work was already on a queue, non-zero otherwise.
@@ -268,7 +268,7 @@ EXPORT_SYMBOL_GPL(queue_delayed_work);
  * queue_delayed_work_on - queue work on specific CPU after delay
  * @cpu: CPU number to execute work on
  * @wq: workqueue to use
- * @work: work to queue
+ * @dwork: work to queue
  * @delay: number of jiffies to wait before queueing
  *
  * Returns 0 if @work was already on a queue, non-zero otherwise.
@@ -637,9 +637,11 @@ int schedule_on_each_cpu(work_func_t func)
 
         mutex_lock(&workqueue_mutex);
         for_each_online_cpu(cpu) {
-                INIT_WORK(per_cpu_ptr(works, cpu), func);
-                __queue_work(per_cpu_ptr(keventd_wq->cpu_wq, cpu),
-                                per_cpu_ptr(works, cpu));
+                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);
         }
         mutex_unlock(&workqueue_mutex);
         flush_workqueue(keventd_wq);