[src/netbsd-7]: src/sys/external/bsd/drm2/linux Pull up following revision(s)...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/47f30681bc2f
branches:  netbsd-7
changeset: 798357:47f30681bc2f
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Sep 21 18:03:33 2014 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/linux/linux_work.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 49960ce2b372 -r 47f30681bc2f sys/external/bsd/drm2/linux/linux_work.c
--- a/sys/external/bsd/drm2/linux/linux_work.c  Sun Sep 21 18:01:28 2014 +0000
+++ b/sys/external/bsd/drm2/linux/linux_work.c  Sun Sep 21 18:03:33 2014 +0000
@@ -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 @@
                            &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 @@
                            &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;