svn commit: r351158 - head/sys/compat/linuxkpi/common/include/linux

[Conrad Meyer]

Author: cem
Date: Sat Aug 17 03:00:58 2019
New Revision: 351158
URL: https://svnweb.freebsd.org/changeset/base/351158

Log:
  Linuxkpi: Prevent easy generated ctor name conflicts with prefix
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/sys/compat/linuxkpi/common/include/linux/workqueue.h

Modified: head/sys/compat/linuxkpi/common/include/linux/workqueue.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/workqueue.h	Sat Aug 17 02:36:42 2019	(r351157)
+++ head/sys/compat/linuxkpi/common/include/linux/workqueue.h	Sat Aug 17 03:00:58 2019	(r351158)
@@ -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)