Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull up following revision(s) (requested by riastradh in ticket #98): 

sys/external/bsd/drm2/linux/linux_work.c: revision 1.8
Don't forget to lock wq_lock around handling wq_delayed.
This commit is contained in:
snj 2014-09-21 18:03:33 +00:00
parent d77144f0bd
commit 6474d8a0f6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/external/bsd/drm2/linux/linux_work.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_work.c,v 1.7 2014/07/29 17:36:06 riastradh Exp $ */
/* $NetBSD: linux_work.c,v 1.7.2.1 2014/09/21 18:03:33 snj Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.7 2014/07/29 17:36:06 riastradh Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.7.2.1 2014/09/21 18:03:33 snj Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -577,7 +577,9 @@ queue_delayed_work(struct workqueue_struct *wq, struct delayed_work *dw,
&linux_worker_intr, dw);
dw->work.w_state = WORK_DELAYED;
dw->work.w_wq = wq;
mutex_enter(&wq->wq_lock);
TAILQ_INSERT_HEAD(&wq->wq_delayed, dw, dw_entry);
mutex_exit(&wq->wq_lock);
}
newly_queued = true;
break;
@ -636,7 +638,9 @@ mod_delayed_work(struct workqueue_struct *wq, struct delayed_work *dw,
&linux_worker_intr, dw);
dw->work.w_state = WORK_DELAYED;
dw->work.w_wq = wq;
mutex_enter(&wq->wq_lock);
TAILQ_INSERT_HEAD(&wq->wq_delayed, dw, dw_entry);
mutex_exit(&wq->wq_lock);
}
timer_modified = false;
break;