From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757268AbYCNPFy (ORCPT ); Fri, 14 Mar 2008 11:05:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752639AbYCNPFo (ORCPT ); Fri, 14 Mar 2008 11:05:44 -0400 Received: from gw.goop.org ([64.81.55.164]:38832 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751131AbYCNPFn (ORCPT ); Fri, 14 Mar 2008 11:05:43 -0400 Message-ID: <47DA93D0.4050708@goop.org> Date: Fri, 14 Mar 2008 08:03:44 -0700 From: Jeremy Fitzhardinge User-Agent: Thunderbird 2.0.0.12 (X11/20080226) MIME-Version: 1.0 To: Jan Beulich CC: linux-kernel@vger.kernel.org Subject: Re: [PATCH] x86: simplify sync_test_bit() References: <47DA3DC0.76E4.0078.0@novell.com> In-Reply-To: <47DA3DC0.76E4.0078.0@novell.com> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Jan Beulich wrote: > There really is no need for a redundant implementation here, just keep > the alternative name for allowing consumers to use consistent naming. > > Signed-off-by: Jan Beulich > > --- a/include/asm-x86/sync_bitops.h > +++ b/include/asm-x86/sync_bitops.h > @@ -130,26 +130,7 @@ static inline int sync_test_and_change_b > return oldbit; > } > > -static __always_inline int sync_constant_test_bit(int nr, const volatile unsigned long *addr) > -{ > - return ((1UL << (nr & 31)) & > - (((const volatile unsigned int *)addr)[nr >> 5])) != 0; > -} > - > -static inline int sync_var_test_bit(int nr, const volatile unsigned long * addr) > -{ > - int oldbit; > - > - __asm__ __volatile__("btl %2,%1\n\tsbbl %0,%0" > - :"=r" (oldbit) > - :"m" (ADDR),"Ir" (nr)); > - return oldbit; > -} > - > -#define sync_test_bit(nr,addr) \ > - (__builtin_constant_p(nr) ? \ > - sync_constant_test_bit((nr),(addr)) : \ > - sync_var_test_bit((nr),(addr))) > +#define sync_test_bit test_bit Hm, #define sync_test_bit(nr, addr) test_bit(nr, addr) would be better, but seems reasonable to me. Or even an inline for consistency. J