diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2013-09-11 14:23:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 15:58:26 -0700 |
| commit | 205e550a0fb469ae73f91a903f27f4f63e774037 (patch) | |
| tree | 94492d97283ec6ee0d2bbf8a3910fb44178905fb /kernel/task_work.c | |
| parent | 202da400570d991bacda4a06e878cb901e96a783 (diff) | |
| download | linux-205e550a0fb469ae73f91a903f27f4f63e774037.tar.gz linux-205e550a0fb469ae73f91a903f27f4f63e774037.tar.bz2 linux-205e550a0fb469ae73f91a903f27f4f63e774037.zip | |
task_work: minor cleanups
Trivial. Remove the unnecessary "work = NULL" initialization and turn
read_barrier_depends() into smp_read_barrier_depends() in
task_work_cancel().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/task_work.c')
| -rw-r--r-- | kernel/task_work.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/task_work.c b/kernel/task_work.c index 65bd3c92d6f3..6ee09856f725 100644 --- a/kernel/task_work.c +++ b/kernel/task_work.c @@ -25,7 +25,7 @@ struct callback_head * task_work_cancel(struct task_struct *task, task_work_func_t func) { struct callback_head **pprev = &task->task_works; - struct callback_head *work = NULL; + struct callback_head *work; unsigned long flags; /* * If cmpxchg() fails we continue without updating pprev. @@ -35,7 +35,7 @@ task_work_cancel(struct task_struct *task, task_work_func_t func) */ raw_spin_lock_irqsave(&task->pi_lock, flags); while ((work = ACCESS_ONCE(*pprev))) { - read_barrier_depends(); + smp_read_barrier_depends(); if (work->func != func) pprev = &work->next; else if (cmpxchg(pprev, work, work->next) == work) |