From 3ec5f20484cc4201e1d7b87844505644533b6148 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 27 Jul 2020 11:23:19 +1000 Subject: powerpc/io: The eieio() function clashes with FreeBSD. Change. --- 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 841df81f47..521c97801d 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. -- cgit v1.2.3