[rtems-libbsd commit] i386: Make <machine/cpufunc.h> compile clean

Sebastian Huber sebh at rtems.org
Fri Jul 31 11:56:56 UTC 2015


Module:    rtems-libbsd
Branch:    master
Commit:    2fc413a47ef5aefd9db9d2abebfa63e3050e5e3b
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=2fc413a47ef5aefd9db9d2abebfa63e3050e5e3b

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Jul 31 11:52:16 2015 +0200

i386: Make <machine/cpufunc.h> compile clean

---

 freebsd/sys/i386/include/machine/cpufunc.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/freebsd/sys/i386/include/machine/cpufunc.h b/freebsd/sys/i386/include/machine/cpufunc.h
index b41e8fe..1c51992 100644
--- a/freebsd/sys/i386/include/machine/cpufunc.h
+++ b/freebsd/sys/i386/include/machine/cpufunc.h
@@ -172,6 +172,7 @@ mfence(void)
 
 #ifdef _KERNEL
 
+#ifndef __rtems__
 #define	HAVE_INLINE_FFS
 
 static __inline int
@@ -187,6 +188,7 @@ ffs(int mask)
 }
 
 #define	HAVE_INLINE_FLS
+#endif /* __rtems__ */
 
 #ifndef __rtems__
 static __inline int
@@ -685,6 +687,7 @@ write_cyrix_reg(u_char reg, u_char data)
 	outb(0x23, data);
 }
 
+#ifndef __rtems__
 static __inline register_t
 intr_disable(void)
 {
@@ -700,6 +703,7 @@ intr_restore(register_t eflags)
 {
 	write_eflags(eflags);
 }
+#endif /* __rtems__ */
 
 #else /* !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */
 



More information about the vc mailing list