[src/trunk]: src/sys/external/bsd Move IS_REACHABLE to <linux/kernel.h> to av...

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

details:   https://anonhg.NetBSD.org/src/rev/3efe3cc9ff0e
branches:  trunk
changeset: 1027787:3efe3cc9ff0e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 00:31:35 2021 +0000

description:
Move IS_REACHABLE to <linux/kernel.h> to avoid double definition.

diffstat:

 sys/external/bsd/common/include/linux/kernel.h |  5 +++--
 sys/external/bsd/drm2/drm/files.drmkms         |  5 +----
 sys/external/bsd/drm2/include/linux/export.h   |  5 +----
 3 files changed, 5 insertions(+), 10 deletions(-)

diffs (56 lines):

diff -r f5d7aa321d7a -r 3efe3cc9ff0e sys/external/bsd/common/include/linux/kernel.h
--- a/sys/external/bsd/common/include/linux/kernel.h    Sun Dec 19 00:31:27 2021 +0000
+++ b/sys/external/bsd/common/include/linux/kernel.h    Sun Dec 19 00:31:35 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kernel.h,v 1.26 2020/10/19 11:49:56 jmcneill Exp $     */
+/*     $NetBSD: kernel.h,v 1.27 2021/12/19 00:31:35 riastradh Exp $    */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -60,8 +60,9 @@
 #define        __LITTLE_ENDIAN         _LITTLE_ENDIAN
 #endif
 
+#define        IS_BUILTIN(option)      (1) /* Probably... */
 #define        IS_ENABLED(option)      (option)
-#define        IS_BUILTIN(option)      (1) /* Probably... */
+#define        IS_REACHABLE(option)    (option)
 
 #define        __printf        __printflike
 #define        __user
diff -r f5d7aa321d7a -r 3efe3cc9ff0e sys/external/bsd/drm2/drm/files.drmkms
--- a/sys/external/bsd/drm2/drm/files.drmkms    Sun Dec 19 00:31:27 2021 +0000
+++ b/sys/external/bsd/drm2/drm/files.drmkms    Sun Dec 19 00:31:35 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drmkms,v 1.41 2021/12/19 00:30:18 riastradh Exp $
+#      $NetBSD: files.drmkms,v 1.42 2021/12/19 00:31:35 riastradh Exp $
 
 include "external/bsd/drm2/linux/files.drmkms_linux"
 
@@ -35,9 +35,6 @@
 makeoptions    drmkms  CPPFLAGS+="-DCONFIG_DRM_FBDEV_EMULATION=1"
 makeoptions    drmkms  CPPFLAGS+="-DCONFIG_FB=0"
 
-makeoptions    drmkms  CPPFLAGS+="-DIS_ENABLED\(X\)=X"
-makeoptions    drmkms  CPPFLAGS+="-DIS_REACHABLE\(X\)=X"
-
 # NetBSD additions.
 file   external/bsd/drm2/drm/drm_agp_hook.c            drmkms
 file   external/bsd/drm2/drm/drm_cdevsw.c              drmkms
diff -r f5d7aa321d7a -r 3efe3cc9ff0e sys/external/bsd/drm2/include/linux/export.h
--- a/sys/external/bsd/drm2/include/linux/export.h      Sun Dec 19 00:31:27 2021 +0000
+++ b/sys/external/bsd/drm2/include/linux/export.h      Sun Dec 19 00:31:35 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: export.h,v 1.3 2021/12/19 00:29:17 riastradh Exp $     */
+/*     $NetBSD: export.h,v 1.4 2021/12/19 00:31:35 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -37,7 +37,4 @@
 /* XXX Provisional -- this shouldn't happen in sources we use.  */
 #define        EXPORT_SYMBOL_GPL(name)
 
-#define        IS_ENABLED(X)   X
-#define        IS_REACHABLE(X) X
-
 #endif  /* _LINUX_EXPORT_H_ */