projects
/
linux
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-4.21/block-20190102' of git://git.kernel.dk/linux-block
[linux]
/
kernel
/
task_work.c
diff --git
a/kernel/task_work.c
b/kernel/task_work.c
index
5718b3e
..
0fef395
100644
(file)
--- a/
kernel/task_work.c
+++ b/
kernel/task_work.c
@@
-68,7
+68,7
@@
task_work_cancel(struct task_struct *task, task_work_func_t func)
* we raced with task_work_run(), *pprev == NULL/exited.
*/
raw_spin_lock_irqsave(&task->pi_lock, flags);
* we raced with task_work_run(), *pprev == NULL/exited.
*/
raw_spin_lock_irqsave(&task->pi_lock, flags);
- while ((work =
lockless_dereference
(*pprev))) {
+ while ((work =
READ_ONCE
(*pprev))) {
if (work->func != func)
pprev = &work->next;
else if (cmpxchg(pprev, work, work->next) == work)
if (work->func != func)
pprev = &work->next;
else if (cmpxchg(pprev, work, work->next) == work)