From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
To: linux-kernel@vger.kernel.org, Andrew Morton <akpm@osdl.org>,
Ingo Molnar <mingo@redhat.com>,
Greg Kroah-Hartman <gregkh@suse.de>,
Christoph Hellwig <hch@infradead.org>
Cc: ltt-dev@shafik.org, systemtap@sources.redhat.com,
Douglas Niehaus <niehaus@eecs.ku.edu>,
"Martin J. Bligh" <mbligh@mbligh.org>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 3/9] atomic.h : i386 "64 bits" ready fix.
Date: Wed, 20 Dec 2006 19:08:12 -0500 [thread overview]
Message-ID: <20061221000812.GI28643@Krystal> (raw)
In-Reply-To: <20061221000351.GF28643@Krystal>
This patch changes the cmpxchg, xchg and add_unless atomic operations on i386 so
they will still work if, for instance, they are cut'n'pasted to operate of
atomic64_t types. The correct fix might be to create inline functions for
cmpxchg for every architecture, but until then, it looks safer to put this kind
of automatic typing instead of using an integer.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
--- a/include/asm-i386/atomic.h
+++ b/include/asm-i386/atomic.h
@@ -207,8 +207,9 @@ static __inline__ int atomic_sub_return(
return atomic_add_return(-i,v);
}
-#define atomic_cmpxchg(v, old, new) ((int)cmpxchg(&((v)->counter), old, new))
-#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
+#define atomic_cmpxchg(v, old, new) \
+ ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (old), (new)))
+#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
/**
* atomic_add_unless - add unless the number is a given value
@@ -221,7 +222,7 @@ #define atomic_xchg(v, new) (xchg(&((v)-
*/
#define atomic_add_unless(v, a, u) \
({ \
- int c, old; \
+ __typeof__((v)->counter) c, old; \
c = atomic_read(v); \
for (;;) { \
if (unlikely(c == (u))) \
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg
Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
next prev parent reply other threads:[~2006-12-21 0:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-21 0:03 [PATCH 0/9] atomic.h : standardising atomic primitives Mathieu Desnoyers
2006-12-21 0:06 ` [PATCH 1/9] atomic.h : alpha architecture Mathieu Desnoyers
2006-12-21 0:07 ` [PATCH 2/9] atomic.h : generic atomic_long Mathieu Desnoyers
2006-12-21 0:08 ` Mathieu Desnoyers [this message]
2006-12-21 0:09 ` [PATCH 4/9] atomic.h : ia64 Mathieu Desnoyers
2006-12-21 0:10 ` [PATCH 5/9] atomic.h : standardising atomic primitives Mathieu Desnoyers
2006-12-21 0:10 ` [PATCH 6/9] atomic.h : parisc Mathieu Desnoyers
2006-12-21 0:12 ` [PATCH 7/9] atomic.h : powerpc Mathieu Desnoyers
2006-12-21 3:15 ` Benjamin Herrenschmidt
2006-12-21 3:29 ` Mathieu Desnoyers
2006-12-21 0:12 ` [PATCH 8/9] atomic.h : sparc Mathieu Desnoyers
2006-12-21 0:14 ` [PATCH 9/9] atomic.h : x86_64 Mathieu Desnoyers
2006-12-21 19:42 ` [PATCH] atomic.h : x86_64 atomic64_add_return Mathieu Desnoyers
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=20061221000812.GI28643@Krystal \
--to=mathieu.desnoyers@polymtl.ca \
--cc=akpm@osdl.org \
--cc=gregkh@suse.de \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ltt-dev@shafik.org \
--cc=mbligh@mbligh.org \
--cc=mingo@redhat.com \
--cc=niehaus@eecs.ku.edu \
--cc=systemtap@sources.redhat.com \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox