xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/int10/helper_exec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02775efb8930291cc62fc84086c97da75b912a55
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jan 24 17:35:04 2012 -0500

    int10: Fix unmapping of the BIOS scratch area
    
    342f3eac8460fc48cfad1f1d7be939d671e6e1cd introduced a bug, 'base' is
    incremented before use.  The old code corrected this when unmapping, so
    the new code should too.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index 638f566..03f9f7d 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -726,7 +726,7 @@ xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save)
 	}
     }
     
-    pci_device_unmap_legacy(pInt->dev, base, pagesize);
+    pci_device_unmap_legacy(pInt->dev, base - BIOS_SCRATCH_OFF, pagesize);
 }
 #endif