Pull workqueue updates from Tejun Heo: "Three trivial workqueue changes" * 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: Fix comment for work_on_cpu() sched/core: Get rid of 'cpu' argument in wq_worker_sleeping() workqueue: Replace usage of init_name with dev_set_name()
Showing the changes to kernel/workqueue.c (1 of 3 files). Show all
Unified · Split
| @@ -857,7 +857,6 @@ void wq_worker_waking_up(struct task_struct *task, int cpu) · 856 unmodified lines | |||
| 857 | /** | 857 | /** |
| 858 | * wq_worker_sleeping - a worker is going to sleep | 858 | * wq_worker_sleeping - a worker is going to sleep |
| 859 | * @task: task going to sleep | 859 | * @task: task going to sleep |
| 860 | * @cpu: CPU in question, must be the current CPU number | ||
| 861 | * | 860 | * |
| 862 | * This function is called during schedule() when a busy worker is | 861 | * This function is called during schedule() when a busy worker is |
| 863 | * going to sleep. Worker on the same cpu can be woken up by | 862 | * going to sleep. Worker on the same cpu can be woken up by |
| @@ -869,7 +868,7 @@ void wq_worker_waking_up(struct task_struct *task, int cpu) · 5 unmodified lines | |||
| 869 | * Return: | 868 | * Return: |
| 870 | * Worker task on @cpu to wake up, %NULL if none. | 869 | * Worker task on @cpu to wake up, %NULL if none. |
| 871 | */ | 870 | */ |
| 872 | struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu) | 871 | struct task_struct *wq_worker_sleeping(struct task_struct *task) |
| 873 | { | 872 | { |
| 874 | struct worker *worker = kthread_data(task), *to_wakeup = NULL; | 873 | struct worker *worker = kthread_data(task), *to_wakeup = NULL; |
| 875 | struct worker_pool *pool; | 874 | struct worker_pool *pool; |
| @@ -885,7 +884,7 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu) · 9 unmodified lines | |||
| 885 | pool = worker->pool; | 884 | pool = worker->pool; |
| 886 | 885 | ||
| 887 | /* this can only happen on the local cpu */ | 886 | /* this can only happen on the local cpu */ |
| 888 | if (WARN_ON_ONCE(cpu != raw_smp_processor_id() || pool->cpu != cpu)) | 887 | if (WARN_ON_ONCE(pool->cpu != raw_smp_processor_id())) |
| 889 | return NULL; | 888 | return NULL; |
| 890 | 889 | ||
| 891 | /* | 890 | /* |
| @@ -4695,7 +4694,7 @@ static void work_for_cpu_fn(struct work_struct *work) · 3803 unmodified lines | |||
| 4695 | } | 4694 | } |
| 4696 | 4695 | ||
| 4697 | /** | 4696 | /** |
| 4698 | * work_on_cpu - run a function in user context on a particular cpu | 4697 | * work_on_cpu - run a function in thread context on a particular cpu |
| 4699 | * @cpu: the cpu to run on | 4698 | * @cpu: the cpu to run on |
| 4700 | * @fn: the function to run | 4699 | * @fn: the function to run |
| 4701 | * @arg: the function arg | 4700 | * @arg: the function arg |
| @@ -5221,8 +5220,8 @@ int workqueue_sysfs_register(struct workqueue_struct *wq) · 519 unmodified lines | |||
| 5221 | 5220 | ||
| 5222 | wq_dev->wq = wq; | 5221 | wq_dev->wq = wq; |
| 5223 | wq_dev->dev.bus = &wq_subsys; | 5222 | wq_dev->dev.bus = &wq_subsys; |
| 5224 | wq_dev->dev.init_name = wq->name; | ||
| 5225 | wq_dev->dev.release = wq_device_release; | 5223 | wq_dev->dev.release = wq_device_release; |
| 5224 | dev_set_name(&wq_dev->dev, "%s", wq->name); | ||
| 5226 | 5225 | ||
| 5227 | /* | 5226 | /* |
| 5228 | * unbound_attrs are created separately. Suppress uevent until | 5227 | * unbound_attrs are created separately. Suppress uevent until |