Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Fri Feb 6 16:48:46 CET 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-01-29 16:55:54.000000000 +0100 +++ xorg-x11-server/xorg-x11-server.changes 2009-01-31 15:23:03.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Jan 31 15:21:21 CET 2009 - schwab@suse.de + +- Provide proper fallback when legacy_mem is not available. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- pci-legacy-mem-fallback.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.q26322/_old 2009-02-06 16:48:07.000000000 +0100 +++ /var/tmp/diff_new_pack.q26322/_new 2009-02-06 16:48:07.000000000 +0100 @@ -29,7 +29,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 22 +Release: 24 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -112,6 +112,7 @@ Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch Patch126: commit-a9e2030.diff Patch127: dpms_screensaver.diff +Patch128: pci-legacy-mem-fallback.diff %description This package contains the X.Org Server. @@ -233,6 +234,7 @@ %patch125 -p1 %patch126 -p1 %patch127 -p1 +%patch128 %build pushd xorg-docs-* @@ -564,6 +566,8 @@ %endif %changelog +* Sat Jan 31 2009 schwab@suse.de +- Provide proper fallback when legacy_mem is not available. * Thu Jan 29 2009 sndirsch@suse.de - reenabled Security extension (bnc #470601) * Fri Jan 16 2009 sndirsch@suse.de ++++++ pci-legacy-mem-fallback.diff ++++++ --- hw/xfree86/os-support/bus/linuxPci.c +++ hw/xfree86/os-support/bus/linuxPci.c @@ -493,6 +493,7 @@ xf86MapDomainMemory(int ScreenNum, int F * legacy_mem interface is unavailable. */ if ((Base > 1024*1024) || ((fd = linuxOpenLegacy(dev, "legacy_mem")) < 0)) + fallback: return linuxMapPci(ScreenNum, Flags, dev, Base, Size, PCIIOC_MMAP_IS_MEM); else @@ -501,6 +502,8 @@ xf86MapDomainMemory(int ScreenNum, int F if (fd >= 0) close(fd); if (addr == NULL || addr == MAP_FAILED) { + if (errno == ENXIO) + goto fallback; perror("mmap failure"); FatalError("xf86MapDomainMem(): mmap() failure\n"); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org