X Strike Force SVN commit: rev 563 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-09-21 16:15:47 -0500 (Sun, 21 Sep 2003)
New Revision: 563
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
Log:
Resync patch #021 with #000_stolen_from_HEAD_int10.diff and improve
error reporting when ioperm()/iopl() fail for reasons other then ENODEV).
* debian/patches/021_riscpc_ioport_fix.diff
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-09-21 19:12:02 UTC (rev 562)
+++ branches/4.3.0/sid/debian/changelog 2003-09-21 21:15:47 UTC (rev 563)
@@ -171,10 +171,12 @@
- xlibs conflicts with xbase-clients (<< 4.3.0) and xlibs-data (<< 4.3.0)
- xlibs-data conflicts with xbase-clients (<< 4.3.0)
- * debian/patches/000_stolen_from_HEAD_int10.diff: Update
- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c to latest
- version from upstream CVS HEAD to resolve severe performance problems
- caused by opening /dev/mem with the O_SYNC flag, per Egbert Eich.
+ * Update xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c to
+ latest version from upstream CVS HEAD to resolve severe performance
+ problems caused by opening /dev/mem with the O_SYNC flag, per Egbert Eich.
+ - debian/patches/000_stolen_from_HEAD_int10.diff: updated
+ - debian/patches/021_riscpc_ioport_fix.diff: resynced (also improve error
+ reporting when ioperm()/iopl() fail for reasons other then ENODEV)
-- Branden Robinson <branden@debian.org> Sun, 21 Sep 2003 14:02:39 -0500
Modified: branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff 2003-09-21 19:12:02 UTC (rev 562)
+++ branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff 2003-09-21 21:15:47 UTC (rev 563)
@@ -4,18 +4,19 @@
Not submitted upstream yet.
---- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c~ Mon Apr 8 14:00:48 2002
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c Mon Apr 8 14:03:55 2002
-@@ -25,6 +25,8 @@
+--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c~ 2003-09-21 16:07:20.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c 2003-09-21 16:10:30.000000000 -0500
+@@ -25,6 +25,9 @@
*/
/* $XConsortium: lnx_video.c /main/9 1996/10/19 18:06:34 kaleb $ */
+#include <errno.h>
++#include <string.h>
+
#include "X.h"
#include "input.h"
#include "scrnintstr.h"
-@@ -516,8 +518,12 @@
+@@ -520,8 +523,13 @@
}
close(fd);
#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
@@ -25,7 +26,8 @@
+ if (errno == ENODEV)
+ ErrorF("xf86EnableIOPorts: no I/O ports found\n");
+ else
-+ FatalError("xf86EnableIOPorts: Failed to set IOPL for I/O\n");
++ FatalError("xf86EnableIOPorts: failed to set IOPL"
++ " for I/O (%s)\n", strerror(errno));
+ }
# if !defined(__alpha__)
ioperm(0x40,4,0); /* trap access to the timer chip */
Reply to: