From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754972AbZAaRAe (ORCPT ); Sat, 31 Jan 2009 12:00:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752534AbZAaRA0 (ORCPT ); Sat, 31 Jan 2009 12:00:26 -0500 Received: from gw.goop.org ([64.81.55.164]:48093 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752464AbZAaRA0 (ORCPT ); Sat, 31 Jan 2009 12:00:26 -0500 Message-ID: <498483A8.30101@goop.org> Date: Sat, 31 Jan 2009 09:00:24 -0800 From: Jeremy Fitzhardinge User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: Ingo Molnar CC: "H. Peter Anvin" , linux-kernel@vger.kernel.org, Xen-devel , the arch/x86 maintainers , Ian Campbell , Zachary Amsden , Rusty Russell , Ravikiran Thirumalai Subject: Re: [PATCH 0 of 7] x86/paravirt: optimise pvop calls and register use References: <49815764.6040809@kernel.org> <49817C26.2020503@goop.org> <4983DBC9.5080701@kernel.org> <20090131161240.GA3014@elte.hu> In-Reply-To: <20090131161240.GA3014@elte.hu> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ingo Molnar wrote: > there's some build trouble on VMI: > > arch/x86/kernel/vmi_32.c: In function ‘activate_vmi’: > arch/x86/kernel/vmi_32.c:673: error: incompatible types in assignment > arch/x86/kernel/vmi_32.c:673: error: incompatible types in assignment > arch/x86/kernel/vmi_32.c:674: error: incompatible types in assignment > arch/x86/kernel/vmi_32.c:674: error: incompatible types in assignment > arch/x86/kernel/vmi_32.c:675: error: incompatible types in assignment > arch/x86/kernel/vmi_32.c:675: error: incompatible types in assignment > arch/x86/kernel/vmi_32.c:676: error: incompatible types in assignment > arch/x86/kernel/vmi_32.c:676: error: incompatible types in assignment > Yes. I sent a couple of fix patches last night, which included a fix for this. J Subject: x86/vmi: fix interrupt enable/disable/save/restore calling convention. Zach says: > Enable/Disable have no clobbers at all. > Save clobbers only return value, %eax > Restore also clobbers nothing. This is precisely compatible with the calling convention, so we can just call them directly without wrapping. Signed-off-by: Jeremy Fitzhardinge --- arch/x86/kernel/vmi_32.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) =================================================================== --- a/arch/x86/kernel/vmi_32.c +++ b/arch/x86/kernel/vmi_32.c @@ -670,10 +670,11 @@ para_fill(pv_mmu_ops.write_cr2, SetCR2); para_fill(pv_mmu_ops.write_cr3, SetCR3); para_fill(pv_cpu_ops.write_cr4, SetCR4); - para_fill(pv_irq_ops.save_fl, GetInterruptMask); - para_fill(pv_irq_ops.restore_fl, SetInterruptMask); - para_fill(pv_irq_ops.irq_disable, DisableInterrupts); - para_fill(pv_irq_ops.irq_enable, EnableInterrupts); + + para_fill(pv_irq_ops.save_fl.func, GetInterruptMask); + para_fill(pv_irq_ops.restore_fl.func, SetInterruptMask); + para_fill(pv_irq_ops.irq_disable.func, DisableInterrupts); + para_fill(pv_irq_ops.irq_enable.func, EnableInterrupts); para_fill(pv_cpu_ops.wbinvd, WBINVD); para_fill(pv_cpu_ops.read_tsc, RDTSC);