Skip to contentSkip to conversation

xenomai 2.1 ppc64 build fix

PATCH Applied Heikki Lindholm 2 participants 2 messages Nov 18, 2005 – Nov 20, 2005 Atomic infrastructure

lore
Share & tools
lore

Heikki Lindholm

author
#0 lore raw

PATCH 1/1 xenomai 2.1 ppc64 build fix

Xenomai 2.1:

- powerpc/atomic.h lost one 64-bit #ifdef during the merge - ppc64 defines its own atomic mask functions.

-- Heikki Lindholm

include/asm-powerpc/atomic.h +2 -0
diff -Nru xenomai/include/asm-powerpc/atomic.h xenomai-devel/include/asm-powerpc/atomic.h
@@ -210,6 +210,7 @@
     return t;
 }
 
+#ifndef __powerpc64__
 static __inline__ void atomic_set_mask(unsigned long mask,
 				       unsigned long *ptr)
 {

@@ -237,6 +238,7 @@
 	: "r" (ptr), "r" (mask)
 	: "r5", "cc", "memory");
 }
+#endif /* __powerpc64__ */
 
 #define xnarch_atomic_xchg(ptr,v)   atomic_xchg(ptr,v)
 #define xnarch_memory_barrier()     __asm__ __volatile__("": : :"memory")
Applied
#1 lore raw
Quoted 4 lines · Heikki Lindholm

Xenomai 2.1:

- powerpc/atomic.h lost one 64-bit #ifdef during the merge - ppc64 defines its own atomic mask functions.

Applied, thanks.

Quoted 33 lines

-- Heikki Lindholm

------------------------------------------------------------------------

diff -Nru xenomai/include/asm-powerpc/atomic.h xenomai-devel/include/asm-powerpc/atomic.h

include/asm-powerpc/atomic.h +2 -1
@@ -210,6 +210,7 @@
     return t;
 }
 
+#ifndef __powerpc64__
 static __inline__ void atomic_set_mask(unsigned long mask,
 				       unsigned long *ptr)
 {

@@ -237,6 +238,7 @@
 	: "r" (ptr), "r" (mask)
 	: "r5", "cc", "memory");
 }
+#endif /* __powerpc64__ */
 
 #define xnarch_atomic_xchg(ptr,v)   atomic_xchg(ptr,v)
 #define xnarch_memory_barrier()     __asm__ __volatile__("": : :"memory")
 
 
------------------------------------------------------------------------

_______________________________________________
Xenomai-core mailing list
[email protected]
https://mail.gna.org/listinfo/xenomai-core

Signature · 1 line
Philippe.