From 419fe172c2d611146de69e10609c3bcaabc4b6bd Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Sat, 17 Aug 2019 03:00:58 +0000 Subject: [PATCH] Linuxkpi: Prevent easy generated ctor name conflicts with prefix Sponsored by: Dell EMC Isilon --- sys/compat/linuxkpi/common/include/linux/workqueue.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/workqueue.h b/sys/compat/linuxkpi/common/include/linux/workqueue.h index 8a9fbace3a07..dfd09d5738ae 100644 --- a/sys/compat/linuxkpi/common/include/linux/workqueue.h +++ b/sys/compat/linuxkpi/common/include/linux/workqueue.h @@ -91,11 +91,12 @@ struct delayed_work { #define DECLARE_DELAYED_WORK(name, fn) \ struct delayed_work name; \ - static void name##_init(void *arg) \ + static void __linux_delayed_ ## name ## _init(void *arg) \ { \ linux_init_delayed_work(&name, fn); \ } \ - SYSINIT(name, SI_SUB_LOCK, SI_ORDER_SECOND, name##_init, NULL) + SYSINIT(name, SI_SUB_LOCK, SI_ORDER_SECOND, \ + __linux_delayed_ ## name##_init, NULL) static inline struct delayed_work * to_delayed_work(struct work_struct *work)