From: Wolfgang Grandegger <wg@domain.hid>
To: xenomai-core <xenomai@xenomai.org>
Subject: [Xenomai-core] [PATCH] removing atomic_xchg from incluce/asm-poerpc/atomic.h
Date: Wed, 01 Nov 2006 12:07:29 +0100 [thread overview]
Message-ID: <45487FF1.5090402@domain.hid> (raw)
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
Hello,
the attached patch fixes:
2006-11-01 Wolfgang Grandegger <wg@domain.hid>
* 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.
[-- Attachment #2: xenomai-powerpc-atomic-xchg.patch --]
[-- Type: text/x-patch, Size: 1553 bytes --]
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 <wg@domain.hid>
+ * 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 <rpm@xenomai.org>
* include/asm-i386/wrappers.h: Add accessors to the IRQ descriptor
next reply other threads:[~2006-11-01 11:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-01 11:07 Wolfgang Grandegger [this message]
2006-11-01 11:41 ` [Xenomai-core] [PATCH] removing atomic_xchg from incluce/asm-poerpc/atomic.h Philippe Gerum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45487FF1.5090402@domain.hid \
--to=wg@domain.hid \
--cc=xenomai@xenomai.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.