Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964928AbbGHRy5 (ORCPT ); Wed, 8 Jul 2015 13:54:57 -0400 Received: from foss.arm.com ([217.140.101.70]:42700 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758484AbbGHRyz (ORCPT ); Wed, 8 Jul 2015 13:54:55 -0400 Message-ID: <559D63EC.2090602@arm.com> Date: Wed, 08 Jul 2015 18:54:52 +0100 From: Marc Zyngier Organization: ARM Ltd User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.7.0 MIME-Version: 1.0 To: Paolo Bonzini , Catalin Marinas , Will Deacon , Christoffer Dall CC: "kvmarm@lists.cs.columbia.edu" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvm@vger.kernel.org" Subject: Re: [PATCH 07/13] arm64: KVM: VHE: Patch out use of HVC References: <1436372356-30410-1-git-send-email-marc.zyngier@arm.com> <1436372356-30410-8-git-send-email-marc.zyngier@arm.com> <559D5A8A.4030901@redhat.com> In-Reply-To: <559D5A8A.4030901@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1061 Lines: 32 On 08/07/15 18:14, Paolo Bonzini wrote: > > > On 08/07/2015 18:19, Marc Zyngier wrote: >> +/* Hack to allow stringification of macros... */ >> +#define __S__(a,args...) __stringify(a, ##args) >> +#define _S_(a,args...) __S__(a, args) >> + >> +.macro ifnvhe nonvhe vhe >> + alternative_insn "\nonvhe", "\vhe", ARM64_HAS_VIRT_HOST_EXTN >> +.endm > > Why not use this in patch 6 too? I tried, and ended up in #include hell. vhe-macros.h is local to arch/arm64/kvm, and including it from asm/kvm_mmu.h breaks (we include it from arch/arm/kvm/ and virt/kvm/arm/). Alternatively, I could move it to arch/arm64/include/asm (renamed to kvm_vhe_macros.h?), which would solve this issue. I just gave it a go, and that seems sensible enough. Thanks for the suggestion! M. -- Jazz is not dead. It just smells funny... -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/