Page MenuHomeFreeBSD
Files F160717172

D57730.id180255.diff
No OneTemporary
Actions

D57730.id180255.diff
View Options

diff --git a/sys/compat/linuxkpi/common/include/linux/workqueue.h b/sys/compat/linuxkpi/common/include/linux/workqueue.h
--- a/sys/compat/linuxkpi/common/include/linux/workqueue.h
+++ b/sys/compat/linuxkpi/common/include/linux/workqueue.h
@@ -237,6 +237,7 @@
extern struct workqueue_struct *system_unbound_wq;
extern struct workqueue_struct *system_highpri_wq;
extern struct workqueue_struct *system_power_efficient_wq;
+extern struct workqueue_struct *system_percpu_wq;
extern void linux_init_delayed_work(struct delayed_work *, work_func_t);
extern void linux_work_fn(void *, int);
diff --git a/sys/compat/linuxkpi/common/src/linux_work.c b/sys/compat/linuxkpi/common/src/linux_work.c
--- a/sys/compat/linuxkpi/common/src/linux_work.c
+++ b/sys/compat/linuxkpi/common/src/linux_work.c
@@ -57,6 +57,7 @@
struct workqueue_struct *system_unbound_wq;
struct workqueue_struct *system_highpri_wq;
struct workqueue_struct *system_power_efficient_wq;
+struct workqueue_struct *system_percpu_wq;
struct taskqueue *linux_irq_work_tq;
@@ -721,7 +722,14 @@
/* populate the workqueue pointers */
system_long_wq = linux_system_long_wq;
+ /*
+ * With Linux v6.18 system_wq was "renamed" to system_percpu_wq with the
+ * old name staying around.
+ * Note: neither implementation here does fully implement the per-cpu
+ * character upstream expects.
+ */
system_wq = linux_system_short_wq;
+ system_percpu_wq = linux_system_short_wq;
system_power_efficient_wq = linux_system_short_wq;
system_unbound_wq = linux_system_short_wq;
system_highpri_wq = linux_system_short_wq;
@@ -737,6 +745,7 @@
/* clear workqueue pointers */
system_long_wq = NULL;
system_wq = NULL;
+ system_percpu_wq = NULL;
system_power_efficient_wq = NULL;
system_unbound_wq = NULL;
system_highpri_wq = NULL;

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 28, 3:26 AM (4 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34384842
Default Alt Text
D57730.id180255.diff (1 KB)

Event Timeline