Hello,
the attached patch fixes:
2006-11-01 Wolfgang Grandegger <[EMAIL PROTECTED]>
* include/asm-powerpc/atomic.h: remove atomic_xch because it's
used in the kernel since 2.6.18 with different arguments (pointer
of type atomic_t).
Wolfgang.
Index: include/asm-powerpc/atomic.h
===================================================================
--- include/asm-powerpc/atomic.h (revision 1785)
+++ include/asm-powerpc/atomic.h (working copy)
@@ -30,9 +30,7 @@
#include <asm/atomic.h>
#include <asm/system.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
-#define atomic_xchg(ptr,v) xchg(ptr,v)
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) */
+#define xnarch_atomic_xchg(ptr,v) xchg(ptr,v)
#define xnarch_memory_barrier() smp_mb()
#ifdef CONFIG_PPC64
@@ -159,7 +157,7 @@
return x;
}
-#define atomic_xchg(ptr,x) \
+#define xnarch_atomic_xchg(ptr,x) \
({ \
__typeof__(*(ptr)) _x_ = (x); \
(__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_, sizeof(*(ptr)));\
@@ -171,8 +169,6 @@
#endif /* __KERNEL__ */
-#define xnarch_atomic_xchg(ptr,v) atomic_xchg(ptr,v)
-
typedef unsigned long atomic_flags_t;
#endif /* !_XENO_ASM_POWERPC_ATOMIC_H */
Index: ChangeLog
===================================================================
--- ChangeLog (revision 1785)
+++ ChangeLog (working copy)
@@ -1,3 +1,8 @@
+2006-11-01 Wolfgang Grandegger <[EMAIL PROTECTED]>
+ * include/asm-powerpc/atomic.h: remove atomic_xch because it's
+ used in the kernel since 2.6.18 with different arguments (pointer
+ of type atomic_t).
+
2006-10-31 Philippe Gerum <[EMAIL PROTECTED]>
* include/asm-i386/wrappers.h: Add accessors to the IRQ descriptor
_______________________________________________
Xenomai-core mailing list
Xenomai-core@gna.org
https://mail.gna.org/listinfo/xenomai-core
