From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5603 invoked by alias); 21 Dec 2006 00:08:22 -0000 Received: (qmail 5596 invoked by uid 22791); 21 Dec 2006 00:08:21 -0000 X-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00,FORGED_RCVD_HELO,TW_PX X-Spam-Check-By: sourceware.org Received: from tomts13.bellnexxia.net (HELO tomts13-srv.bellnexxia.net) (209.226.175.34) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 21 Dec 2006 00:08:15 +0000 Received: from krystal.dyndns.org ([67.68.205.181]) by tomts13-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20061221000813.NLLT1773.tomts13-srv.bellnexxia.net@krystal.dyndns.org> for ; Wed, 20 Dec 2006 19:08:13 -0500 Received: from localhost (localhost [127.0.0.1]) (uid 1000) by krystal.dyndns.org with local; Wed, 20 Dec 2006 19:08:12 -0500 id 0014F591.4589D06C.00006034 Date: Thu, 21 Dec 2006 00:10:00 -0000 From: Mathieu Desnoyers To: linux-kernel@vger.kernel.org, Andrew Morton , Ingo Molnar , Greg Kroah-Hartman , Christoph Hellwig Cc: ltt-dev@shafik.org, systemtap@sources.redhat.com, Douglas Niehaus , "Martin J. Bligh" , Thomas Gleixner Subject: [PATCH 3/9] atomic.h : i386 "64 bits" ready fix. Message-ID: <20061221000812.GI28643@Krystal> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline In-Reply-To: <20061221000351.GF28643@Krystal> X-Editor: vi X-Info: http://krystal.dyndns.org:8080 X-Operating-System: Linux/2.4.32-grsec (i686) X-Uptime: 19:07:07 up 119 days, 21:14, 6 users, load average: 1.43, 1.48, 1.17 User-Agent: Mutt/1.5.13 (2006-08-11) X-IsSubscribed: yes Mailing-List: contact systemtap-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: systemtap-owner@sourceware.org X-SW-Source: 2006-q4/txt/msg00716.txt.bz2 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 --- 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