Module Name: src
Committed By: riastradh
Date: Mon Dec 30 04:50:21 UTC 2013
Modified Files:
src/sys/external/bsd/drm2/include/linux [riastradh-drm2]: workqueue.h
src/sys/external/bsd/drm2/linux [riastradh-drm2]: linux_work.c
Log Message:
Add flush_scheduled_work back.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 \
src/sys/external/bsd/drm2/include/linux/workqueue.h
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 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/include/linux/workqueue.h
diff -u src/sys/external/bsd/drm2/include/linux/workqueue.h:1.1.2.11 src/sys/external/bsd/drm2/include/linux/workqueue.h:1.1.2.12
--- src/sys/external/bsd/drm2/include/linux/workqueue.h:1.1.2.11 Mon Dec 30 04:50:12 2013
+++ src/sys/external/bsd/drm2/include/linux/workqueue.h Mon Dec 30 04:50:21 2013
@@ -1,4 +1,4 @@
-/* $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.
@@ -94,6 +94,7 @@ 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 *);
Index: src/sys/external/bsd/drm2/linux/linux_work.c
diff -u src/sys/external/bsd/drm2/linux/linux_work.c:1.1.2.1 src/sys/external/bsd/drm2/linux/linux_work.c:1.1.2.2
--- src/sys/external/bsd/drm2/linux/linux_work.c:1.1.2.1 Mon Dec 30 04:50:12 2013
+++ src/sys/external/bsd/drm2/linux/linux_work.c Mon Dec 30 04:50:21 2013
@@ -1,4 +1,4 @@
-/* $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.
@@ -30,7 +30,7 @@
*/
#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>
@@ -172,6 +172,12 @@ destroy_workqueue(struct workqueue_struc
* 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;
