Merge branch 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[cascardo/linux.git] / kernel / workqueue.c

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 1b2e36b..5f5068e 100644 (file)
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -886,7 +886,6 @@ void wq_worker_waking_up(struct task_struct *task, int cpu)
 /**
  * wq_worker_sleeping - a worker is going to sleep
  * @task: task going to sleep
- * @cpu: CPU in question, must be the current CPU number
  *
  * This function is called during schedule() when a busy worker is
  * going to sleep.  Worker on the same cpu can be woken up by
@@ -898,7 +897,7 @@ void wq_worker_waking_up(struct task_struct *task, int cpu)
  * Return:
  * Worker task on @cpu to wake up, %NULL if none.
  */
-struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu)
+struct task_struct *wq_worker_sleeping(struct task_struct *task)
 {
        struct worker *worker = kthread_data(task), *to_wakeup = NULL;
        struct worker_pool *pool;
@@ -914,7 +913,7 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu)
        pool = worker->pool;
 
        /* this can only happen on the local cpu */
-       if (WARN_ON_ONCE(cpu != raw_smp_processor_id() || pool->cpu != cpu))
+       if (WARN_ON_ONCE(pool->cpu != raw_smp_processor_id()))
                return NULL;
 
        /*
@@ -4735,7 +4734,7 @@ static void work_for_cpu_fn(struct work_struct *work)
 }
 
 /**
- * work_on_cpu - run a function in user context on a particular cpu
+ * work_on_cpu - run a function in thread context on a particular cpu
  * @cpu: the cpu to run on
  * @fn: the function to run
  * @arg: the function arg
@@ -5261,8 +5260,8 @@ int workqueue_sysfs_register(struct workqueue_struct *wq)
 
        wq_dev->wq = wq;
        wq_dev->dev.bus = &wq_subsys;
-       wq_dev->dev.init_name = wq->name;
        wq_dev->dev.release = wq_device_release;
+       dev_set_name(&wq_dev->dev, "%s", wq->name);
 
        /*
         * unbound_attrs are created separately.  Suppress uevent until