Module Name: src
Committed By: riastradh
Date: Sun Dec 19 00:31:35 UTC 2021
Modified Files:
src/sys/external/bsd/common/include/linux: kernel.h
src/sys/external/bsd/drm2/drm: files.drmkms
src/sys/external/bsd/drm2/include/linux: export.h
Log Message:
Move IS_REACHABLE to <linux/kernel.h> to avoid double definition.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/common/include/linux/kernel.h
cvs rdiff -u -r1.41 -r1.42 src/sys/external/bsd/drm2/drm/files.drmkms
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/export.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/common/include/linux/kernel.h
diff -u src/sys/external/bsd/common/include/linux/kernel.h:1.26 src/sys/external/bsd/common/include/linux/kernel.h:1.27
--- src/sys/external/bsd/common/include/linux/kernel.h:1.26 Mon Oct 19 11:49:56 2020
+++ src/sys/external/bsd/common/include/linux/kernel.h Sun Dec 19 00:31:35 2021
@@ -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_ENABLED(option) (option)
#define IS_BUILTIN(option) (1) /* Probably... */
+#define IS_ENABLED(option) (option)
+#define IS_REACHABLE(option) (option)
#define __printf __printflike
#define __user
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.41 src/sys/external/bsd/drm2/drm/files.drmkms:1.42
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.41 Sun Dec 19 00:30:18 2021
+++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 00:31:35 2021
@@ -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_B
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
Index: src/sys/external/bsd/drm2/include/linux/export.h
diff -u src/sys/external/bsd/drm2/include/linux/export.h:1.3 src/sys/external/bsd/drm2/include/linux/export.h:1.4
--- src/sys/external/bsd/drm2/include/linux/export.h:1.3 Sun Dec 19 00:29:17 2021
+++ src/sys/external/bsd/drm2/include/linux/export.h Sun Dec 19 00:31:35 2021
@@ -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_ */
