xserver: Branch 'master'

[Benjamin Close]

 hw/xfree86/common/compiler.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14581afb474552716c02ca15220ca7050123c375
Author: Benjamin Close <Benjamin.Close at clearchain.com>
Date:   Thu Feb 26 17:32:10 2009 +1030

    xfree86: correctly define barriers for FreeBSD amd64
    
    Previously when compiling on freebsd amd64 we'd end up at xi86
    block (line 1315) which would define mem_barrier and write_mem_barrier
    to be NOP's. Instead they should be valid, as per the linux amd64 setup.
    
    This stops the hangs experienced by many when using the nv driver
    which would hang due to out of order dma requests as noticed in
    http://bugs.freedesktop.org/show_bug.cgi?id=3168
    
    Signed-off-by: Benjamin Close <Benjamin.Close at clearchain.com>

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 40b463e..2ef95d8 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -462,7 +462,7 @@ extern _X_EXPORT unsigned int inb(unsigned long port);
 extern _X_EXPORT unsigned int inw(unsigned long port);
 extern _X_EXPORT unsigned int inl(unsigned long port);
  
-#   elif defined(linux) && defined(__amd64__)
+#   elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
  
 #    include <inttypes.h>