summaryrefslogtreecommitdiffstats
path: root/kernel/sched
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-19 04:05:39 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-19 04:05:39 +0100
commitef504fa591aae6f6ebdf26edbe6ec0bfd32ea7d3 (patch)
tree901d6010137751fc0bc724308d149de4f46b63d1 /kernel/sched
parentMerge branch 'akpm' (patches from Andrew) (diff)
parentworkqueue: Fix comment for work_on_cpu() (diff)
downloadlinux-ef504fa591aae6f6ebdf26edbe6ec0bfd32ea7d3.tar.xz
linux-ef504fa591aae6f6ebdf26edbe6ec0bfd32ea7d3.zip
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()
Diffstat (limited to 'kernel/sched')
-rw-r--r--kernel/sched/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ea8f49ae0062..4edecc15177d 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -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);
}