Package: xserver-xfree86
Version: 4.1.0-16woody1
Severity: important
Tags: patch
The file programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c requires
some checks for ARM to prevent it trying to execute code only for x86.
This is consistent with other non-x86 platforms. This patch was made
against 4.3 experimental sources, but is just as relevant to 4.1 in
woody and 4.2 in unstable.
--- lnx_video.old.c Sat Sep 20 09:06:20 2003
+++ lnx_video.c Tue Sep 23 10:53:46 2003
@@ -517,7 +517,7 @@
#endif
}
close(fd);
-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) &&
!defined(__sh__) &&
!defined(__hppa__)
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) &&
!defined(__sh__) &&
!defined(__hppa__) && !defined(__arm__)
if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n");
@@ -542,7 +542,7 @@
#if defined(__powerpc__)
munmap(ioBase, 0x20000);
ioBase = NULL;
-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) &&
!defined(__sh__) &&
!defined(__hppa__)
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) &&
!defined(__sh__) &&
!defined(__hppa__) && !defined(__arm__)
iopl(0);
ioperm(0, 1024, 0);
#endif
@@ -561,12 +561,12 @@
Bool
xf86DisableInterrupts()
{
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) &&
!defined(__mips__) &&
!defined(__ia64__) && !defined(__sh__) && !defined(__hppa__)
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) &&
!defined(__mips__) &&
!defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) &&
!defined(__arm__)
if (!ExtendedEnabled)
if (iopl(3) || ioperm(0, 1024, 1))
return (FALSE);
#endif
-#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) ||
defined(__sparc__) ||
defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__)
|| defined(__hppa__)
+#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) ||
defined(__sparc__) ||
defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__)
|| defined(__hppa__) ||
defined(__arm__)
#else
# ifdef __GNUC__
# if defined(__ia64__)
@@ -580,7 +580,7 @@
asm("cli");
# endif
#endif
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) &&
!defined(__mips__) &&
!defined(__sh__) && !defined(__ia64__) && !defined(__hppa__)
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) &&
!defined(__mips__) &&
!defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) &&
!defined(__arm__)
if (!ExtendedEnabled) {
iopl(0);
ioperm(0, 1024, 0);
@@ -593,12 +593,12 @@
void
xf86EnableInterrupts()
{
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) &&
!defined(__mips__) &&
!defined(__ia64__) && !defined(__sh__) && !defined(__hppa__)
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) &&
!defined(__mips__) &&
!defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) &&
!defined(__arm__)
if (!ExtendedEnabled)
if (iopl(3) || ioperm(0, 1024, 1))
return;
#endif
-#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) ||
defined(__sparc__) ||
defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__)
|| defined(__hppa__)
+#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) ||
defined(__sparc__) ||
defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__)
|| defined(__hppa__) ||
defined(__arm__)
#else
# ifdef __GNUC__
# if defined(__ia64__)
@@ -612,7 +612,7 @@
asm("sti");
# endif
#endif
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) &&
!defined(__mips__) &&
!defined(__sh__) && !defined(__ia64__) && !defined(__hppa__)
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) &&
!defined(__mips__) &&
!defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) &&
!defined(__arm__)
if (!ExtendedEnabled) {
iopl(0);
ioperm(0, 1024, 0);
-- System Information
Debian Release: 3.0
Architecture: arm
Kernel: Linux puffin 2.4.21-rmk1-ds3-pn1 #16 Mon Dec 8 21:27:01 GMT 2003 armv5l
Locale: LANG=C, LC_CTYPE=C
Versions of packages xserver-xfree86 depends on:
ii debconf 1.0.32 Debian configuration management sy
ii libc6 2.2.5-11.5 GNU C Library: Shared libraries an
ii xserver-common 4.1.0-16woody1 files and utilities common to all
ii zlib1g 1:1.1.4-1.0woody0 compression library - runtime
