xserver: Branch 'master'

[Julien Cristau]

 hw/xfree86/os-support/bus/Sbus.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae869fc7669764729e13fdd70149ed636753f2a3
Author: David S. Miller <davem at davemloft.net>
Date:   Tue Dec 25 22:42:50 2007 -0800

    [SBUS]: Fix build, use getpagesize() instead of xf86getpagesize().
    
    xf86getpagesize() was removed, but this one call site was
    not fixed up.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>

diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c
index 2f0043f..ff257a8 100644
--- a/hw/xfree86/os-support/bus/Sbus.c
+++ b/hw/xfree86/os-support/bus/Sbus.c
@@ -585,7 +585,7 @@ xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
 _X_EXPORT void
 xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size)
 {
-    unsigned long mask = xf86getpagesize() - 1;
+    unsigned long mask = getpagesize() - 1;
     unsigned long base = (unsigned long)addr & ~mask;
     unsigned long len = (((unsigned long)addr + size + mask) & ~mask) - base;