From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751116AbdEaOhP (ORCPT ); Wed, 31 May 2017 10:37:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60872 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750998AbdEaOhN (ORCPT ); Wed, 31 May 2017 10:37:13 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com ED1DC6598C Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=vkuznets@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com ED1DC6598C From: Vitaly Kuznetsov To: Andy Shevchenko Cc: "x86\@kernel.org" , devel@linuxdriverproject.org, "linux-kernel\@vger.kernel.org" , "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Steven Rostedt , Jork Loeser , Simon Xiao , Andy Lutomirski Subject: Re: [PATCH v5 01/10] x86/hyper-v: include hyperv/ only when CONFIG_HYPERV is set References: <20170530113424.15687-1-vkuznets@redhat.com> <20170530113424.15687-2-vkuznets@redhat.com> Date: Wed, 31 May 2017 16:37:07 +0200 In-Reply-To: (Andy Shevchenko's message of "Tue, 30 May 2017 19:24:33 +0300") Message-ID: <87bmq914a4.fsf@vitty.brq.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 31 May 2017 14:37:13 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Andy Shevchenko writes: > On Tue, May 30, 2017 at 2:34 PM, Vitaly Kuznetsov wrote: >> Code is arch/x86/hyperv/ is only needed when CONFIG_HYPERV is set, the >> 'basic' support and detection lives in arch/x86/kernel/cpu/mshyperv.c >> which is included when CONFIG_HYPERVISOR_GUEST is set. >> >> Signed-off-by: Vitaly Kuznetsov >> Acked-by: K. Y. Srinivasan >> Tested-by: Simon Xiao >> Tested-by: Srikanth Myakam >> --- >> arch/x86/Kbuild | 4 +++- >> arch/x86/include/asm/mshyperv.h | 10 +++++++++- >> 2 files changed, 12 insertions(+), 2 deletions(-) >> >> diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild >> index 586b786..3fa0a3c 100644 >> --- a/arch/x86/Kbuild >> +++ b/arch/x86/Kbuild >> @@ -8,7 +8,9 @@ obj-$(CONFIG_KVM) += kvm/ >> obj-$(CONFIG_XEN) += xen/ >> >> # Hyper-V paravirtualization support >> -obj-$(CONFIG_HYPERVISOR_GUEST) += hyperv/ >> +ifdef CONFIG_HYPERV >> +obj-y += hyperv/ >> +endif > > Can > obj-$(CONFIG_HYPERV) += hyperv/ > work for you instead? > CONFIG_HYPERV can be set to "m" but we want to include the contents of hyperv/ in vmlinux, not in vmbus module. >> +#else /* CONFIG_HYPERV */ >> +static inline void hyperv_init(void) {} > >> +static inline bool hv_is_hypercall_page_setup(void) >> +{ >> + return false; >> +} > > Can it be one line? (It's okay in this case if it goes ~83 characters, > for example) Sure, I'm just trying to avoid such things as later people come with 'fix checkpatch.pl warning' patches. -- Vitaly