summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2005-01-13 00:30:55 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2005-01-13 00:30:55 +0000
commit39f800e592d759a02c52df8c8497f657ac59b29b (patch)
treed6bde23bfddbe0937619abc9e285107dac7e818f /hw
parent731fc608cb6995470346936706a2b51c63ab8418 (diff)
//bugs.freedesktop.org/show_bug.cgi?id=2114) attachment #1576
(https://bugs.freedesktop.org/attachment.cgi?id=1576): Fix build bustage on PPC64 with Linux 2.6.x kernel headers. Patch by Adam Jackson <ajax@freedesktop.org>.
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/common/compiler.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 269b8bfb4..164bcb01f 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -1076,7 +1076,12 @@ xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
extern volatile unsigned char *ioBase;
-# define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
+#if defined(linux) && defined(__powerpc64__)
+# include <asm/memory.h>
+#endif /* defined(linux) && defined(__powerpc64__) */
+#ifndef eieio /* We deal with arch-specific eieio() routines above... */
+# define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
+#endif /* eieio */
static __inline__ unsigned char
xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)