The patch titled
unify queue_delayed_work and queue_delayed_work_on fix
has been removed from the -mm tree. Its filename was
unify-queue_delayed_work-and-queue_delayed_work_on-fix.patch
This patch was dropped because it was folded into unify-queue_delayed_work-and-queue_delayed_work_on.patch
------------------------------------------------------
Subject: unify queue_delayed_work and queue_delayed_work_on fix
From: Jiri Slaby <jirislaby@xxxxxxxxx>
Since cwq->wq is unset for other than singlethread_cpu when singlethread
workqueue was created, an oops occurs during bootup. Fix it by setting
correct private value for workqueue.
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/workqueue.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
diff -puN kernel/workqueue.c~unify-queue_delayed_work-and-queue_delayed_work_on-fix kernel/workqueue.c
--- a/kernel/workqueue.c~unify-queue_delayed_work-and-queue_delayed_work_on-fix
+++ a/kernel/workqueue.c
@@ -210,7 +210,8 @@ int queue_delayed_work_on(int cpu, struc
/* This stores cwq for the moment, for the timer_fn */
set_wq_data(work,
- per_cpu_ptr(wq->cpu_wq, raw_smp_processor_id()));
+ per_cpu_ptr(wq->cpu_wq, wq->singlethread ?
+ singlethread_cpu : raw_smp_processor_id()));
timer->expires = jiffies + delay;
timer->data = (unsigned long)dwork;
timer->function = delayed_work_timer_fn;
_
Patches currently in -mm which might be from jirislaby@xxxxxxxxx are
unify-queue_delayed_work-and-queue_delayed_work_on.patch
unify-queue_delayed_work-and-queue_delayed_work_on-fix.patch
shrink_slab-handle-bad-shrinkers.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
