Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef504fa5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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()
parents 814a2bf9 22aceb31

kernel/sched/core.c

+1 −1
Original line number Diff line number Diff line
@@ -3174,7 +3174,7 @@ static void __sched notrace __schedule(bool preempt) 
			if (prev->flags & PF_WQ_WORKER) {

				struct task_struct *to_wakeup;



				to_wakeup = wq_worker_sleeping(prev, cpu);

				to_wakeup = wq_worker_sleeping(prev);

				if (to_wakeup)

					try_to_wake_up_local(to_wakeup);

			}

kernel/workqueue.c

+4 −5
Original line number Diff line number Diff line
@@ -857,7 +857,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
@@ -869,7 +868,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;
@@ -885,7 +884,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;



	/*
@@ -4695,7 +4694,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
@@ -5221,8 +5220,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

kernel/workqueue_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -69,6 +69,6 @@ static inline struct worker *current_wq_worker(void) 
 * sched/core.c and workqueue.c.

 */

void wq_worker_waking_up(struct task_struct *task, int cpu);

struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu);

struct task_struct *wq_worker_sleeping(struct task_struct *task);



#endif /* _KERNEL_WORKQUEUE_INTERNAL_H */