xserver: Branch 'master'

[James Cloos]

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

New commits:
commit c1bbac2708bbccbec01cecba39cdf2b8160c1dc3
Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu May 14 16:00:41 2009 -0400

    Fix mem_barrier() on Alpha
    
    Some clean up (da086901c6579e41b28b1418fa12ebb82744fc87) went a bit
    too far and removed the needed mem_barrier macro on Alpha.
    
    This re-adds it.

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 2601693..40b463e 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -357,7 +357,8 @@ static __inline__ void stw_u(unsigned long r5, unsigned short * r11)
 #    endif
 }
 
-#    define write_mem_barrier()  __asm__ __volatile__("wmb" : : : "memory")
+#    define mem_barrier() __asm__ __volatile__("mb" : : : "memory")
+#    define write_mem_barrier() __asm__ __volatile__("wmb" : : : "memory")
 
 #   elif defined(linux) && defined(__ia64__)