CVS commit: [netbsd-7] src/sys/external/bsd/drm2/linux

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Sun Sep 21 18:03:33 UTC 2014

Modified Files:
        src/sys/external/bsd/drm2/linux [netbsd-7]: linux_work.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/external/bsd/drm2/linux/linux_work.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/external/bsd/drm2/linux/linux_work.c
diff -u src/sys/external/bsd/drm2/linux/linux_work.c:1.7 src/sys/external/bsd/drm2/linux/linux_work.c:1.7.2.1
--- src/sys/external/bsd/drm2/linux/linux_work.c:1.7	Tue Jul 29 17:36:06 2014
+++ src/sys/external/bsd/drm2/linux/linux_work.c	Sun Sep 21 18:03:33 2014
@@ -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_stru
 			    &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
 			    &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;