[src/trunk]: src/sys/external/bsd Include linux/export.h in linux/printk.h, m...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ee10029de640
branches:  trunk
changeset: 1028158:ee10029de640
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 09:42:27 2021 +0000

description:
Include linux/export.h in linux/printk.h, move to common

linux does this through:
printk.h -> linkage.h -> export.h

this will require less patching of drm files.

Author: Maya Rashish <maya%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/common/include/linux/export.h |  40 ++++++++++++++++++++++++++
 sys/external/bsd/common/include/linux/printk.h |   3 +-
 sys/external/bsd/drm2/include/linux/export.h   |  40 --------------------------
 3 files changed, 42 insertions(+), 41 deletions(-)

diffs (105 lines):

diff -r f92fb9582e29 -r ee10029de640 sys/external/bsd/common/include/linux/export.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/external/bsd/common/include/linux/export.h    Sun Dec 19 09:42:27 2021 +0000
@@ -0,0 +1,40 @@
+/*     $NetBSD: export.h,v 1.1 2021/12/19 09:42:27 riastradh Exp $     */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Taylor R. Campbell.
+ *
+ * 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, 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
+
+#ifndef _LINUX_EXPORT_H_
+#define _LINUX_EXPORT_H_
+
+#define        EXPORT_SYMBOL(name)
+
+/* XXX Provisional -- this shouldn't happen in sources we use.  */
+#define        EXPORT_SYMBOL_GPL(name)
+
+#endif  /* _LINUX_EXPORT_H_ */
diff -r f92fb9582e29 -r ee10029de640 sys/external/bsd/common/include/linux/printk.h
--- a/sys/external/bsd/common/include/linux/printk.h    Sun Dec 19 02:00:03 2021 +0000
+++ b/sys/external/bsd/common/include/linux/printk.h    Sun Dec 19 09:42:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: printk.h,v 1.8 2021/12/19 01:14:07 riastradh Exp $     */
+/*     $NetBSD: printk.h,v 1.9 2021/12/19 09:42:27 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -34,6 +34,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <linux/export.h>
 
 #define        printk          printf
 #define        vprintk         vprintf
diff -r f92fb9582e29 -r ee10029de640 sys/external/bsd/drm2/include/linux/export.h
--- a/sys/external/bsd/drm2/include/linux/export.h      Sun Dec 19 02:00:03 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*     $NetBSD: export.h,v 1.4 2021/12/19 00:31:35 riastradh Exp $     */
-
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Taylor R. Campbell.
- *
- * 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, 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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 FOUNDATION OR CONTRIBUTORS
- * 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.
- */
-
-#ifndef _LINUX_EXPORT_H_
-#define _LINUX_EXPORT_H_
-
-#define        EXPORT_SYMBOL(name)
-
-/* XXX Provisional -- this shouldn't happen in sources we use.  */
-#define        EXPORT_SYMBOL_GPL(name)
-
-#endif  /* _LINUX_EXPORT_H_ */