LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Subject: [PATCH 03/10] atomic.h : i386 type safety fix
Date: Sun, 11 Feb 2007 14:17:41 -0500	[thread overview]
Message-ID: <11712214681364-git-send-email-mathieu.desnoyers@polymtl.ca> (raw)
In-Reply-To: <11712214684187-git-send-email-mathieu.desnoyers@polymtl.ca>

atomic.h : i386 type safety fix

This patch removes an explicit cast to an integer type for the result returned
by cmpxchg. It is not per se a problem on the i386 architecture, because
sizeof(int) == sizeof(long), but whenever this code is cut'n'pasted to a
different architecture (which happened at least for x86_64), it would simply
accept passing an atomic64_t value as parameter to cmpxchg, xchg and
add_unless, having 64 bits inputs casted to 32 bits.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

--- a/include/asm-i386/atomic.h
+++ b/include/asm-i386/atomic.h
@@ -207,8 +207,8 @@ static __inline__ int atomic_sub_return(int i, atomic_t *v)
 	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) (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 +221,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t *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)))				\

  parent reply	other threads:[~2007-02-11 19:22 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-11 19:17 [PATCH 00/10] atomic.h : standardizing atomic primitives Mathieu Desnoyers
2007-02-11 19:17 ` [PATCH 01/10] atomic.h : Add atomic64 cmpxchg, xchg and add_unless to alpha Mathieu Desnoyers
2007-02-11 19:17 ` [PATCH 02/10] atomic.h : Complete atomic_long operations in asm-generic Mathieu Desnoyers
2007-02-11 19:17 ` Mathieu Desnoyers [this message]
2007-02-11 19:17 ` [PATCH 04/10] atomic.h : Add atomic64 cmpxchg, xchg and add_unless to ia64 Mathieu Desnoyers
2007-02-11 19:17 ` [PATCH 05/10] atomic.h : Add atomic64 cmpxchg, xchg and add_unless to mips Mathieu Desnoyers
2007-02-11 19:17 ` [PATCH 06/10] atomic.h : Add atomic64 cmpxchg, xchg and add_unless to parisc Mathieu Desnoyers
2007-02-11 19:17 ` [PATCH 07/10] atomic.h : Add atomic64 cmpxchg, xchg and add_unless to powerpc Mathieu Desnoyers
2007-02-11 19:17 ` [PATCH 08/10] atomic.h : Add atomic64 cmpxchg, xchg and add_unless to sparc64 Mathieu Desnoyers
2007-02-11 19:17 ` [PATCH 09/10] atomic.h : Add atomic64_xchg to s390 Mathieu Desnoyers
2007-02-11 19:17 ` [PATCH 10/10] atomic.h : Add atomic64 cmpxchg, xchg and add_unless to x86_64 Mathieu Desnoyers
2007-02-12 11:35   ` Andi Kleen
2007-02-12 16:43     ` Mathieu Desnoyers
2007-02-12 16:49       ` [PATCH] atomic.h : atomic_add_unless as inline. Remove system.h atomic.h circular dependency 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=11712214681364-git-send-email-mathieu.desnoyers@polymtl.ca \
    --to=mathieu.desnoyers@polymtl.ca \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH 03/10] atomic.h : i386 type safety fix' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).