Prev: [PATCH] Staging: arlan: fixed space before tabs style issue in arlan-main.c
Next: 2.6.34-rc5-git10: oops on Atom N270/ i945GSE upon shutdown with X86_MRST && APB_TIMER enabled
From: Oleg Nesterov on 30 Apr 2010 13:00
flush_delayed_work() always uses keventd_wq for re-queueing,
but it should use the workqueue this dwork was queued on.

Signed-off-by: Oleg Nesterov <oleg(a)redhat.com>
---

kernel/workqueue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- 34-rc1/kernel/workqueue.c~FDW_DONT_USE_KEVENT_WQ 2009-12-18 19:05:38.000000000 +0100
+++ 34-rc1/kernel/workqueue.c 2010-04-29 21:08:32.000000000 +0200
@@ -774,7 +774,7 @@ void flush_delayed_work(struct delayed_w
{
if (del_timer_sync(&dwork->timer)) {
struct cpu_workqueue_struct *cwq;
- cwq = wq_per_cpu(keventd_wq, get_cpu());
+ cwq = wq_per_cpu(get_wq_data(&dwork->work)->wq, get_cpu());
__queue_work(cwq, &dwork->work);
put_cpu();
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH] Staging: arlan: fixed space before tabs style issue in arlan-main.c
Next: 2.6.34-rc5-git10: oops on Atom N270/ i945GSE upon shutdown with X86_MRST && APB_TIMER enabled