[src/trunk]: src/sys/external/bsd/common/linux Also Linux wants work->func to...

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

details:   https://anonhg.NetBSD.org/src/rev/874d5bfe4368
branches:  trunk
changeset: 992554:874d5bfe4368
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:00:39 2018 +0000

description:
Also Linux wants work->func to work.

diffstat:

 sys/external/bsd/common/include/linux/workqueue.h |  4 ++--
 sys/external/bsd/common/linux/linux_work.c        |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r d14fa91d979a -r 874d5bfe4368 sys/external/bsd/common/include/linux/workqueue.h
--- a/sys/external/bsd/common/include/linux/workqueue.h Mon Aug 27 07:00:28 2018 +0000
+++ b/sys/external/bsd/common/include/linux/workqueue.h Mon Aug 27 07:00:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: workqueue.h,v 1.4 2018/08/27 07:00:28 riastradh Exp $  */
+/*     $NetBSD: workqueue.h,v 1.5 2018/08/27 07:00:39 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
                WORK_DELAYED_CANCELLED,
        }                       w_state;
        struct workqueue_struct *w_wq;
-       void                    (*w_fn)(struct work_struct *);
+       void                    (*func)(struct work_struct *);
 };
 
 struct delayed_work {
diff -r d14fa91d979a -r 874d5bfe4368 sys/external/bsd/common/linux/linux_work.c
--- a/sys/external/bsd/common/linux/linux_work.c        Mon Aug 27 07:00:28 2018 +0000
+++ b/sys/external/bsd/common/linux/linux_work.c        Mon Aug 27 07:00:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_work.c,v 1.3 2018/08/27 07:00:28 riastradh Exp $ */
+/*     $NetBSD: linux_work.c,v 1.4 2018/08/27 07:00:39 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.3 2018/08/27 07:00:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_work.c,v 1.4 2018/08/27 07:00:39 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -477,7 +477,7 @@
        linux_work_lock_init(work);
        work->w_state = WORK_IDLE;
        work->w_wq = NULL;
-       work->w_fn = fn;
+       work->func = fn;
 }
 
 bool
@@ -635,7 +635,7 @@
 
                /* Unlock it and do it.  Can't use work after this.  */
                linux_work_unlock(work);
-               (*work->w_fn)(work);
+               (*work->func)(work);
 
                /* All done.  Notify anyone waiting for completion.  */
                mutex_enter(&wq->wq_lock);