Merge tag 'drm-next-5.5-2019-10-25' of git://people.freedesktop.org/~agd5f/linux...

[mirror_ubuntu-jammy-kernel.git] / kernel / task_work.c

diff --git a/kernel/task_work.c b/kernel/task_work.c
index 5718b3ea202a3f5dd7186e6454f18fb6be392644..0fef395662a6ea6f38301e92f74d14f60b3f145d 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);
-       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)