From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751915AbbHLSq0 (ORCPT ); Wed, 12 Aug 2015 14:46:26 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:42945 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751256AbbHLSqY (ORCPT ); Wed, 12 Aug 2015 14:46:24 -0400 Message-ID: <55CB9424.7030801@oracle.com> Date: Wed, 12 Aug 2015 14:44:52 -0400 From: Boris Ostrovsky User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Peter Zijlstra , "H. Peter Anvin" CC: Stephen Rothwell , Jeremy Fitzhardinge , Konrad Rzeszutek Wilk , Stefano Stabellini , Xen Devel , Thomas Gleixner , Ingo Molnar , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Lutomirski , David Vrabel Subject: Re: linux-next: manual merge of the xen-tip tree with the tip tree References: <20150812150954.36bc605c@canb.auug.org.au> <55CB49CA.8050305@oracle.com> <20150812172105.GW16853@twins.programming.kicks-ass.net> <20150812174625.GH18673@twins.programming.kicks-ass.net> <55CB8DAD.6090508@oracle.com> <20150812183614.GY16853@twins.programming.kicks-ass.net> In-Reply-To: <20150812183614.GY16853@twins.programming.kicks-ass.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/12/2015 02:36 PM, Peter Zijlstra wrote: > On Wed, Aug 12, 2015 at 11:26:41AM -0700, H. Peter Anvin wrote: >> One option might be to do the addition in assembly, i.e.: >> >> "i" (key), "i" (index) >> >> ... and put the addition into the assembly source. > Like so? Seems to build on gcc-4.6. Yes, this builds on 4.4.4. as well. -boris > > --- > arch/x86/include/asm/jump_label.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h > index 28d7a857f9d1..5daeca3d0f9e 100644 > --- a/arch/x86/include/asm/jump_label.h > +++ b/arch/x86/include/asm/jump_label.h > @@ -22,9 +22,9 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran > ".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t" > ".pushsection __jump_table, \"aw\" \n\t" > _ASM_ALIGN "\n\t" > - _ASM_PTR "1b, %l[l_yes], %c0 \n\t" > + _ASM_PTR "1b, %l[l_yes], %c0 + %c1 \n\t" > ".popsection \n\t" > - : : "i" (&((char *)key)[branch]) : : l_yes); > + : : "i" (key), "i" (branch) : : l_yes); > > return false; > l_yes: > @@ -38,9 +38,9 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool > "2:\n\t" > ".pushsection __jump_table, \"aw\" \n\t" > _ASM_ALIGN "\n\t" > - _ASM_PTR "1b, %l[l_yes], %c0 \n\t" > + _ASM_PTR "1b, %l[l_yes], %c0 + %c1 \n\t" > ".popsection \n\t" > - : : "i" (&((char *)key)[branch]) : : l_yes); > + : : "i" (key), "i" (branch) : : l_yes); > > return false; > l_yes: