xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/os-support/hurd/hurd_video.c |    9 +++++++++
 hw/xfree86/os-support/linux/lnx_video.c |    2 ++
 2 files changed, 11 insertions(+)

New commits:
commit a6c64d96456d794b2f3ce40915922a3fba636b95
Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Sun Oct 24 15:18:28 2010 +0200

    Do not trap access to timer and keyboard
    
    Disable timer/keyboard trapping on GNU/Hurd for now
    
    Trapping disabled for now, as some VBIOSes (mga-g450 notably) use these
    ports, and the int10 wrapper is not emulating them.
    
    It's effectively what happens in the Linux variant too, as iopl() is used there,
    making the ioperm() meaningless.
    
    Signed-off-by: Olaf Buddenhagen <antrik at users.sf.net>
    Signed-off-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index 3d7af40..39f353b 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -124,8 +124,17 @@ xf86EnableIO()
 	FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
 	return FALSE;
     }
+#if 0
+    /*
+     * Trapping disabled for now, as some VBIOSes (mga-g450 notably) use these
+     * ports, and the int10 wrapper is not emulating them. (Note that it's
+     * effectively what happens in the Linux variant too, as iopl() is used
+     * there, making the ioperm() meaningless.)
+     *
+     * Reenable this when int10 gets fixed.  */
     ioperm(0x40,4,0); /* trap access to the timer chip */
     ioperm(0x60,4,0); /* trap access to the keyboard controller */
+#endif
     return TRUE;
 }
 	
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index b97757c..39c728d 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -530,6 +530,8 @@ xf86EnableIO(void)
 		return FALSE;
         }
 # if !defined(__alpha__)
+	/* XXX: this is actually not trapping anything because of iopl(3)
+	 * above */
 	ioperm(0x40,4,0); /* trap access to the timer chip */
 	ioperm(0x60,4,0); /* trap access to the keyboard controller */
 # endif