andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: Pull generic barrier() definition up to top level

Browse Source 
And remove the redundant redecl from the nds32 section.

Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Adam Jackson 2014-07-22 10:59:11 -04:00 committed by Keith Packard
parent c73929bbfc
commit 1c1711b57f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/common/compiler.h
View File

@ -94,6 +94,7 @@
#if !defined(__GNUC__) && !defined(__FUNCTION__) #if !defined(__GNUC__) && !defined(__FUNCTION__)
#define __FUNCTION__ __func__ /* C99 */ #define __FUNCTION__ __func__ /* C99 */
#endif #endif
#if defined(DO_PROTOTYPES) #if defined(DO_PROTOTYPES)
#if !defined(__arm__) #if !defined(__arm__)
#if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \ #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
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#ifndef barrier
#define barrier()
#endif
#ifndef mem_barrier #ifndef mem_barrier
#define mem_barrier() /* NOP */ #define mem_barrier() /* NOP */
#endif #endif
@ -790,8 +795,6 @@ xf_outl(unsigned short port, unsigned int val)
* if there is unaligned port access. * if there is unaligned port access.
*/ */
#define barrier() /* no barrier */
#define PORT_SIZE long #define PORT_SIZE long
static __inline__ unsigned char static __inline__ unsigned char
@ -964,9 +967,6 @@ inl(unsigned PORT_SIZE port)
#endif /* NDS32_MMIO_SWAP */ #endif /* NDS32_MMIO_SWAP */
#define mem_barrier() /* XXX: nop for now */
#define write_mem_barrier() /* XXX: nop for now */
#elif defined(__i386__) || defined(__ia64__) #elif defined(__i386__) || defined(__ia64__)
static __inline__ void static __inline__ void