 @@ -1,14 +1,14 @@
-/*	$NetBSD: workqueue.h,v 1.1.2.11 2013/12/30 04:50:12 riastradh Exp $	*/
+/*	$NetBSD: workqueue.h,v 1.1.2.12 2013/12/30 04:50:21 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -84,26 +84,27 @@ to_delayed_work(struct work_struct *work
+{
 	return container_of(work, struct delayed_work, work);
+}
 extern struct workqueue_struct	*system_wq;
 int	linux_workqueue_init(void);
 void	linux_workqueue_fini(void);
 struct workqueue_struct *
 	alloc_ordered_workqueue(const char *, int);
 void	destroy_workqueue(struct workqueue_struct *);
 void	flush_workqueue(struct workqueue_struct *);
 void	flush_scheduled_work(void);
 void	INIT_WORK(struct work_struct *, void (*)(struct work_struct *));
 void	schedule_work(struct work_struct *);
 void	queue_work(struct workqueue_struct *, struct work_struct *);
 bool	cancel_work_sync(struct work_struct *);
 void	INIT_DELAYED_WORK(struct delayed_work *,
 	    void (*)(struct work_struct *));
 void	schedule_delayed_work(struct delayed_work *, unsigned long);
 void	queue_delayed_work(struct workqueue_struct *, struct delayed_work *,
 	    unsigned long ticks);
 bool	cancel_delayed_work(struct delayed_work *);
 bool	cancel_delayed_work_sync(struct delayed_work *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_work.c,v 1.1.2.1 2013/12/30 04:50:12 riastradh Exp $	*/
+/*	$NetBSD: linux_work.c,v 1.1.2.2 2013/12/30 04:50:21 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.1.2.1 2013/12/30 04:50:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.1.2.2 2013/12/30 04:50:21 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/callout.h>
 #include <sys/condvar.h>
 #include <sys/errno.h>
 #include <sys/intr.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/workqueue.h>
 @@ -162,26 +162,32 @@ destroy_workqueue(struct workqueue_struc
 	wq->wq_workqueue = NULL;
 	cv_destroy(&wq->wq_cv);
 	mutex_destroy(&wq->wq_lock);
+}
 /*
  * Flush
+ *
  * Note:  This doesn't cancel or wait for delayed work.  This seems to
  * match what Linux does (or, doesn't do).
  */
 void
 flush_scheduled_work(void)
+{
 	flush_workqueue(system_wq);
+}
 struct wq_flush_work {
 	struct work_struct	wqfw_work;
 	struct wq_flush		*wqfw_flush;
 };
 struct wq_flush {
 	kmutex_t	wqf_lock;
 	kcondvar_t	wqf_cv;
 	unsigned int	wqf_n;
 };
 void
 flush_workqueue(struct workqueue_struct *wq)