X Strike Force X.Org X11 SVN commit: r3814 - in trunk/xserver/xorg-server/debian: . patches
Author: jurij
Date: 2006-10-15 01:03:36 -0400 (Sun, 15 Oct 2006)
New Revision: 3814
Added:
trunk/xserver/xorg-server/debian/patches/32_disable_sparc_pci_bridge.diff
Modified:
trunk/xserver/xorg-server/debian/changelog
trunk/xserver/xorg-server/debian/patches/series
Log:
Disable broken sparc PCI bridge handling
(32_disable_sparc_pci_bridge.diff)
Modified: trunk/xserver/xorg-server/debian/changelog
===================================================================
--- trunk/xserver/xorg-server/debian/changelog 2006-10-15 01:53:17 UTC (rev 3813)
+++ trunk/xserver/xorg-server/debian/changelog 2006-10-15 05:03:36 UTC (rev 3814)
@@ -14,6 +14,11 @@
reporting the bug, Michel Dänzer for reading through the backtrace and
diagnosing the problem, and Alan for the final patch. Closes: #390646.
+ [ Jurij Smakov ]
+ * Add 32_disable_sparc_pci_bridge.diff. Disable PCI bridge handling on
+ sparc, which is broken and causes filesystem corruption (by poking
+ the PCI bus in the wrong places) on some machines. Closes: #392312.
+
-- David Nusinow <dnusinow@debian.org> Fri, 13 Oct 2006 16:05:54 -0400
xorg-server (2:1.1.1-9) unstable; urgency=low
Added: trunk/xserver/xorg-server/debian/patches/32_disable_sparc_pci_bridge.diff
===================================================================
--- trunk/xserver/xorg-server/debian/patches/32_disable_sparc_pci_bridge.diff (rev 0)
+++ trunk/xserver/xorg-server/debian/patches/32_disable_sparc_pci_bridge.diff 2006-10-15 05:03:36 UTC (rev 3814)
@@ -0,0 +1,13 @@
+Index: xorg-server/hw/xfree86/os-support/bus/Pci.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/os-support/bus/Pci.h 2006-10-14 21:57:12.000000000 -0700
++++ xorg-server/hw/xfree86/os-support/bus/Pci.h 2006-10-14 21:57:46.000000000 -0700
+@@ -328,7 +328,7 @@
+ # define INCLUDE_XF86_MAP_PCI_MEM
+ # define INCLUDE_XF86_NO_DOMAIN
+ # endif
+-# if !defined(__FreeBSD__)
++# if !defined(__FreeBSD__) && !defined(linux)
+ # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
+ # endif
+ #elif defined(__amd64__) || defined(__amd64)
Modified: trunk/xserver/xorg-server/debian/patches/series
===================================================================
--- trunk/xserver/xorg-server/debian/patches/series 2006-10-15 01:53:17 UTC (rev 3813)
+++ trunk/xserver/xorg-server/debian/patches/series 2006-10-15 05:03:36 UTC (rev 3814)
@@ -27,3 +27,4 @@
29_mesa_reseed_makefile.diff -p0
30_fix_vmode_switch.diff
31_blocksigio.diff
+32_disable_sparc_pci_bridge.diff
Reply to: