[rtems commit] powerpc/io: The eieio() function clashes with FreeBSD. Change.

Chris Johns chrisj at rtems.org
Wed Aug 12 03:03:02 UTC 2020


Module:    rtems
Branch:    5
Commit:    5284e812e2c82466b3f3a21e494310d8cb69c7cd
Changeset: http://git.rtems.org/rtems/commit/?id=5284e812e2c82466b3f3a21e494310d8cb69c7cd

Author:    Chris Johns <chrisj at rtems.org>
Date:      Mon Jul 27 11:23:19 2020 +1000

powerpc/io: The eieio() function clashes with FreeBSD. Change.

Closes #4021

---

 bsps/powerpc/include/libcpu/io.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bsps/powerpc/include/libcpu/io.h b/bsps/powerpc/include/libcpu/io.h
index 841df81..521c978 100644
--- a/bsps/powerpc/include/libcpu/io.h
+++ b/bsps/powerpc/include/libcpu/io.h
@@ -50,7 +50,7 @@
  * Acts as a barrier to ensure all previous I/O accesses have
  * completed before any further ones are issued.
  */
-static inline void eieio(void)
+static inline void io_eieio(void)
 {
 	__asm__ __volatile__ ("eieio");
 }
@@ -59,9 +59,9 @@ static inline void eieio(void)
 /* Enforce in-order execution of data I/O.
  * No distinction between read/write on PPC; use eieio for all three.
  */
-#define iobarrier_rw() eieio()
-#define iobarrier_r()  eieio()
-#define iobarrier_w()  eieio()
+#define iobarrier_rw() io_eieio()
+#define iobarrier_r()  io_eieio()
+#define iobarrier_w()  io_eieio()
 
 /*
  * 8, 16 and 32 bit, big and little endian I/O operations, with barrier.



More information about the vc mailing list