The branch main has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=43b4c00643bacb9d1ba3aa1022648104bc7ff4a2
commit 43b4c00643bacb9d1ba3aa1022648104bc7ff4a2
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2021-05-24 18:53:28 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2021-05-25 18:01:46 +0000
LinuxKPI: extract stringify() in their own header file
Add linux/stringify.h as directly included by drivers. Remove the
definitions from compiler.h and include the new header in places
where the stringify macros are already used without linuxkpi.
I have adjusted the Copyright of the new file according to the commit
originaly adding the macros (99e690772adbcb78c9e8441bedcf1913d72ea72f).
Sposnored by: The FreeBSD Foundation
MFC after: 2 weeks
Reviewed by: hselasky
Differential Revision: https://reviews.freebsd.org/D30440
---
.../linuxkpi/common/include/linux/compiler.h | 2 --
sys/compat/linuxkpi/common/include/linux/kernel.h | 1 +
sys/compat/linuxkpi/common/include/linux/module.h | 1 +
.../linuxkpi/common/include/linux/stringify.h | 37 ++++++++++++++++++++++
sys/compat/linuxkpi/common/include/linux/sysfs.h | 1 +
5 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h
b/sys/compat/linuxkpi/common/include/linux/compiler.h
index d8aef4fa7988..470e1f151413 100644
--- a/sys/compat/linuxkpi/common/include/linux/compiler.h
+++ b/sys/compat/linuxkpi/common/include/linux/compiler.h
@@ -60,8 +60,6 @@
#define __percpu
#define __weak __weak_symbol
#define __malloc
-#define ___stringify(...) #__VA_ARGS__
-#define __stringify(...) ___stringify(__VA_ARGS__)
#define __attribute_const__ __attribute__((__const__))
#undef __always_inline
#define __always_inline inline
diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h
b/sys/compat/linuxkpi/common/include/linux/kernel.h
index daef6216a151..b30fa8ba5729 100644
--- a/sys/compat/linuxkpi/common/include/linux/kernel.h
+++ b/sys/compat/linuxkpi/common/include/linux/kernel.h
@@ -45,6 +45,7 @@
#include <linux/bitops.h>
#include <linux/compiler.h>
+#include <linux/stringify.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/types.h>
diff --git a/sys/compat/linuxkpi/common/include/linux/module.h
b/sys/compat/linuxkpi/common/include/linux/module.h
index a5a8dd540dd6..cd5366bc52d0 100644
--- a/sys/compat/linuxkpi/common/include/linux/module.h
+++ b/sys/compat/linuxkpi/common/include/linux/module.h
@@ -37,6 +37,7 @@
#include <linux/list.h>
#include <linux/compiler.h>
+#include <linux/stringify.h>
#include <linux/kmod.h>
#include <linux/kobject.h>
#include <linux/sysfs.h>
diff --git a/sys/compat/linuxkpi/common/include/linux/stringify.h
b/sys/compat/linuxkpi/common/include/linux/stringify.h
new file mode 100644
index 000000000000..08fd0d909fae
--- /dev/null
+++ b/sys/compat/linuxkpi/common/include/linux/stringify.h
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2017 Mellanox Technologies, Ltd.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice unmodified, this list of conditions, and the following
+ * disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef __LKPI_LINUX_STRINGIFY_H_
+#define __LKPI_LINUX_STRINGIFY_H_
+
+#include <sys/cdefs.h>
+
+#define ___stringify(...) #__VA_ARGS__
+#define __stringify(...) ___stringify(__VA_ARGS__)
+
+#endif /* __LKPI_LINUX_STRINGIFY_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/sysfs.h
b/sys/compat/linuxkpi/common/include/linux/sysfs.h
index c645d9fdf45a..f84790f1b910 100644
--- a/sys/compat/linuxkpi/common/include/linux/sysfs.h
+++ b/sys/compat/linuxkpi/common/include/linux/sysfs.h
@@ -36,6 +36,7 @@
#include <sys/errno.h>
#include <linux/kobject.h>
+#include <linux/stringify.h>
struct sysfs_ops {
ssize_t (*show)(struct kobject *, struct attribute *, char *);
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
