[PATCH]: Fix xserver SBUS build

David Miller davem at davemloft.net
Wed Dec 26 22:19:00 PST 2007


Please apply this patch to the xserver GIT tree.

Actually this build bug is amusing because GIT changeset
fe25f897c62bb324660217e15dbd3091c808dbba converted the first
xf86getpagesize instance in this file but didn't get this
second one.

Thank you!

>From 9d9f5693475dba0eea4caf7403030d21a8342229 Mon Sep 17 00:00:00 2001
From: David S. Miller <davem at davemloft.net>
Date: Tue, 25 Dec 2007 22:42:50 -0800
Subject: [PATCH] [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>
---
 hw/xfree86/os-support/bus/Sbus.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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;
 
-- 
1.5.4.rc1.23.g3a969




More information about the xorg mailing list