From 1c1711b57f2c278c0df03bf9e7e9a1776a546968 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 22 Jul 2014 10:59:11 -0400 Subject: [PATCH] xfree86: Pull generic barrier() definition up to top level And remove the redundant redecl from the nds32 section. Reviewed-by: Julien Cristau Signed-off-by: Adam Jackson Signed-off-by: Keith Packard --- hw/xfree86/common/compiler.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index e408441c5..b1fd0d847 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -94,6 +94,7 @@ #if !defined(__GNUC__) && !defined(__FUNCTION__) #define __FUNCTION__ __func__ /* C99 */ #endif + #if defined(DO_PROTOTYPES) #if !defined(__arm__) #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \ @@ -199,6 +200,10 @@ extern _X_EXPORT void xf86WriteMmio32Le (void *, unsigned long, unsigned int); #endif #endif /* __GNUC__ */ +#ifndef barrier +#define barrier() +#endif + #ifndef mem_barrier #define mem_barrier() /* NOP */ #endif @@ -790,8 +795,6 @@ xf_outl(unsigned short port, unsigned int val) * if there is unaligned port access. */ -#define barrier() /* no barrier */ - #define PORT_SIZE long static __inline__ unsigned char @@ -964,9 +967,6 @@ inl(unsigned PORT_SIZE port) #endif /* NDS32_MMIO_SWAP */ -#define mem_barrier() /* XXX: nop for now */ -#define write_mem_barrier() /* XXX: nop for now */ - #elif defined(__i386__) || defined(__ia64__) static __inline__ void