debian/changelog | 2 debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff | 36 ---------- debian/patches/series | 1 3 files changed, 2 insertions(+), 37 deletions(-)
New commits: commit fe8a348c5d1c19287902342bc62871b979aa1877 Author: Julien Cristau <jcris...@debian.org> Date: Wed Apr 8 18:42:18 2009 +0100 Remove unused 06_use_proc_instead_of_sysfs_for_pci_domains.diff Obsoleted by pci-rework. diff --git a/debian/changelog b/debian/changelog index 21747b4..d9944fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ xorg-server (2:1.6.0-1) UNRELEASED; urgency=low xfonts-utils since we don't build Xprt anymore. * Fix lintian warnings about xserver-xorg-core.NEWS formatting. * Move -dbg package to new section debug, add ${misc:Depends} where missing. + * Remove unused 06_use_proc_instead_of_sysfs_for_pci_domains.diff, obsoleted + by pci-rework. -- David Nusinow <dnusi...@debian.org> Sun, 15 Feb 2009 18:49:51 -0500 diff --git a/debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff b/debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff deleted file mode 100644 index faf6557..0000000 --- a/debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff +++ /dev/null @@ -1,36 +0,0 @@ -Upstream commit 56f21bda1ce95741c88c423b60bd709eef26eb12 was supposed to -only avoid multiple scans of the PCI devices, but it actually also added -an "optimization" based on using sysfs files instead of /proc. However, -this code is broken, for instance because there are no ioctl handler on -/sys/bus/pci/devices/*/config files while there some on /proc/bus/pci/* - -It breaks the Xserver on architectures that require such ioctls to scan -the PCI devices and/or deal with PCI domains: -#422077: xserver-xorg: Fatal server error on sparc: xf86MapPciMem failed -#422095: xserver-xorg-core: fails to start on powerpc, no devices detected - -The following patch forces the server to behave as if we were running on -a 2.4 kernel while scanning PCI devices, so that the sysfs code is disabled. - -Upstream doesn't apply this patch since they want to fix the sysfs-code. -See https://bugs.freedesktop.org/show_bug.cgi?id=7248 - -Thanks to Jim Watson for testing! - ---- - hw/xfree86/os-support/bus/linuxPci.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: xorg-server-1.3.0.0.dfsg/hw/xfree86/os-support/bus/linuxPci.c -=================================================================== ---- xorg-server-1.3.0.0.dfsg.orig/hw/xfree86/os-support/bus/linuxPci.c 2007-05-10 21:51:55.000000000 +0200 -+++ xorg-server-1.3.0.0.dfsg/hw/xfree86/os-support/bus/linuxPci.c 2007-05-10 21:52:13.000000000 +0200 -@@ -148,7 +148,7 @@ - int domain, bus, dev, func; - char file[64]; - struct stat ignored; -- static int is26 = -1; -+ static int is26 = 0; - - domain = PCI_DOM_FROM_TAG(tag); - bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag)); diff --git a/debian/patches/series b/debian/patches/series index 2781388..1529a77 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 001_fedora_extramodes.patch -#06_use_proc_instead_of_sysfs_for_pci_domains.diff #13_debian_add_xkbpath_env_variable.diff 0001-xorg.conf-5-refer-to-mousedrv-4-.-Debian-394058.patch Turn-on-ModeDebug-by-default.patch -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org