Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:00:39 UTC 2018
Modified Files:
src/sys/external/bsd/common/include/linux: workqueue.h
src/sys/external/bsd/common/linux: linux_work.c
Log Message:
Also Linux wants work->func to work.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/common/include/linux/workqueue.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/common/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/common/include/linux/workqueue.h
diff -u src/sys/external/bsd/common/include/linux/workqueue.h:1.4 src/sys/external/bsd/common/include/linux/workqueue.h:1.5
--- src/sys/external/bsd/common/include/linux/workqueue.h:1.4 Mon Aug 27 07:00:28 2018
+++ src/sys/external/bsd/common/include/linux/workqueue.h Mon Aug 27 07:00:39 2018
@@ -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 @@ struct work_struct {
WORK_DELAYED_CANCELLED,
} w_state;
struct workqueue_struct *w_wq;
- void (*w_fn)(struct work_struct *);
+ void (*func)(struct work_struct *);
};
struct delayed_work {
Index: src/sys/external/bsd/common/linux/linux_work.c
diff -u src/sys/external/bsd/common/linux/linux_work.c:1.3 src/sys/external/bsd/common/linux/linux_work.c:1.4
--- src/sys/external/bsd/common/linux/linux_work.c:1.3 Mon Aug 27 07:00:28 2018
+++ src/sys/external/bsd/common/linux/linux_work.c Mon Aug 27 07:00:39 2018
@@ -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 @@ INIT_WORK(struct work_struct *work, void
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 @@ linux_worker(struct work *wk, void *arg)
/* 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);
