Xenomai 2.1:

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


-- Heikki Lindholm
diff -Nru xenomai/include/asm-powerpc/atomic.h 
xenomai-devel/include/asm-powerpc/atomic.h
--- xenomai/include/asm-powerpc/atomic.h        2005-11-08 09:43:39.000000000 
+0200
+++ xenomai-devel/include/asm-powerpc/atomic.h  2005-11-18 15:37:34.000000000 
+0200
@@ -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")

Reply via email to