From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965167AbXAGVIs (ORCPT ); Sun, 7 Jan 2007 16:08:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965168AbXAGVIs (ORCPT ); Sun, 7 Jan 2007 16:08:48 -0500 Received: from agminet01.oracle.com ([141.146.126.228]:59450 "EHLO agminet01.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965167AbXAGVIr (ORCPT ); Sun, 7 Jan 2007 16:08:47 -0500 Date: Sun, 7 Jan 2007 13:07:26 -0800 From: Randy Dunlap To: Christoph Hellwig Cc: Segher Boessenkool , akpm , lkml Subject: Re: [PATCH] math-emu/setcc: avoid gcc extension Message-Id: <20070107130726.96973116.randy.dunlap@oracle.com> In-Reply-To: <20070107195845.GA21829@infradead.org> References: <20070106221947.8e01d404.randy.dunlap@oracle.com> <33e707f92df6b89a1c22f337f230cf32@kernel.crashing.org> <20070107104555.015aa79f.randy.dunlap@oracle.com> <974f8eb0d5984af6726a130082453916@kernel.crashing.org> <20070107111900.9d434162.randy.dunlap@oracle.com> <20070107195845.GA21829@infradead.org> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.3.0 (GTK+ 2.8.10; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Whitelist: TRUE X-Whitelist: TRUE X-Brightmail-Tracker: AAAAAQAAAAI= Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 7 Jan 2007 19:58:45 +0000 Christoph Hellwig wrote: > On Sun, Jan 07, 2007 at 11:19:00AM -0800, Randy Dunlap wrote: > > On Sun, 7 Jan 2007 20:12:42 +0100 Segher Boessenkool wrote: > > > > > There's an extra tab in that last line. Could you also > > > please fix the indenting (use a tab, not spaces) -- I know > > > it was there originally, but since there are only a few > > > lines in that file like that... :-) > > > > how's this one? > > --- > > From: Randy Dunlap > > > > setcc() in math-emu is written as a gcc extension statement expression > > macro that returns a value. However, it's not used that way and it's > > not needed like that, so just make it a do-while non-extension macro > > so that we don't use an extension when it's not needed. > > > > Signed-off-by: Randy Dunlap > > --- > > arch/i386/math-emu/status_w.h | 5 +++-- > > > > --- > > arch/i386/math-emu/status_w.h | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > --- linux-2620-rc2.orig/arch/i386/math-emu/status_w.h > > +++ linux-2620-rc2/arch/i386/math-emu/status_w.h > > @@ -48,9 +48,10 @@ > > > > #define status_word() \ > > ((partial_status & ~SW_Top & 0xffff) | ((top << SW_Top_Shift) & SW_Top)) > > -#define setcc(cc) ({ \ > > - partial_status &= ~(SW_C0|SW_C1|SW_C2|SW_C3); \ > > - partial_status |= (cc) & (SW_C0|SW_C1|SW_C2|SW_C3); }) > > +#define setcc(cc) do { \ > > + partial_status &= ~(SW_C0|SW_C1|SW_C2|SW_C3); \ > > + partial_status |= (cc) & (SW_C0|SW_C1|SW_C2|SW_C3); \ > > +} while (0) > > Is there any reason you this shouldn't be an inline function? That would be OK in theory, so I just tried it. I don't get the same object files produced with an inline function (for arch/i386/math-emu/fpu_etc.o), so I don't feel that it's quite as safe without digging deeping into the .o file and its changes. The 3 other .o files that use setcc() were the same when using the inline patch version. --- From: Randy Dunlap setcc() in math-emu is written as a gcc extension statement expression macro that returns a value. However, it's not used that way and it's not needed like that, so just make it a do-while non-extension macro so that we don't use an extension when it's not needed. Signed-off-by: Randy Dunlap --- arch/i386/math-emu/status_w.h | 5 +++-- --- arch/i386/math-emu/status_w.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) --- linux-2620-rc2.orig/arch/i386/math-emu/status_w.h +++ linux-2620-rc2/arch/i386/math-emu/status_w.h @@ -48,9 +48,11 @@ #define status_word() \ ((partial_status & ~SW_Top & 0xffff) | ((top << SW_Top_Shift) & SW_Top)) -#define setcc(cc) ({ \ - partial_status &= ~(SW_C0|SW_C1|SW_C2|SW_C3); \ - partial_status |= (cc) & (SW_C0|SW_C1|SW_C2|SW_C3); }) +static inline void setcc(int cc) +{ + partial_status &= ~(SW_C0|SW_C1|SW_C2|SW_C3); + partial_status |= (cc) & (SW_C0|SW_C1|SW_C2|SW_C3); +} #ifdef PECULIAR_486 /* Default, this conveys no information, but an 80486 does it. */