Module Name: xsrc
Committed By: mrg
Date: Tue Aug 16 19:11:51 UTC 2016
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd:
i386_video.c
xsrc/external/mit/xorg-server/include: xorg-config.h
Log Message:
NetBSD calls it x86_86_iopl().
disable iopl in xorg-config.h as it is set in the reachover makefile.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/i386_video.c
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xorg-server/include/xorg-config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/i386_video.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/i386_video.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/i386_video.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/i386_video.c:1.1.1.4 Wed Aug 10 07:44:34 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/i386_video.c Tue Aug 16 19:11:51 2016
@@ -202,6 +202,9 @@ xf86DisableIO()
#endif /* USE_I386_IOPL */
#ifdef USE_AMD64_IOPL
+#ifdef __NetBSD__
+#define amd64_iopl(x) x86_64_iopl(x)
+#endif
/***************************************************************************/
/* I/O Permissions section */
/***************************************************************************/
Index: xsrc/external/mit/xorg-server/include/xorg-config.h
diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.14 xsrc/external/mit/xorg-server/include/xorg-config.h:1.15
--- xsrc/external/mit/xorg-server/include/xorg-config.h:1.14 Sun Aug 14 03:44:46 2016
+++ xsrc/external/mit/xorg-server/include/xorg-config.h Tue Aug 16 19:11:51 2016
@@ -93,7 +93,7 @@
/* #undef USE_DEV_IO */
/* BSD i386 iopl */
-#define USE_I386_IOPL 1
+/* #undef USE_I386_IOPL */
/* System is BSD-like */
#define CSRG_BASED 1
