summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2023-05-18 10:41:15 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2023-05-18 10:41:15 +1000
commit0a91bea0ec6b212e910aa8e3ac1ee4a03a362356 (patch)
tree671db7067ff92f089f88a3eb0df4d439c4369a36
parent303e500511c676459d54b5c5c9b525d8df839266 (diff)
parent933fd4391e3def39551e26d2f8bfff4063278993 (diff)
downloadlinux-next-0a91bea0ec6b212e910aa8e3ac1ee4a03a362356.tar.gz
Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git
-rw-r--r--include/linux/workqueue.h2
-rw-r--r--kernel/workqueue.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 3992c994787f..91d1d6e671c7 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -614,6 +614,8 @@ extern void __warn_flushing_systemwide_wq(void)
({ \
if (0) \
__warn_flushing_systemwide_wq(); \
+ pr_info("Please don't flush events workqueue at %s:%d\n", __FILE__, __LINE__); \
+ show_one_workqueue(system_wq); \
__flush_workqueue(system_wq); \
})
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 4666a1a92a31..74ad7d833a04 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -5012,6 +5012,8 @@ void show_one_workqueue(struct workqueue_struct *wq)
}
}
+/* Temporary export for flush_scheduled_work(). */
+EXPORT_SYMBOL(show_one_workqueue);
/**
* show_one_worker_pool - dump state of specified worker pool