Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757304Ab3DWQcF (ORCPT ); Tue, 23 Apr 2013 12:32:05 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:57790 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757237Ab3DWQb4 (ORCPT ); Tue, 23 Apr 2013 12:31:56 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Marc Zyngier , Christoffer Dall , Will Deacon Subject: [PATCH 04/21] ARM: kvm: define KVM_ARM_MAX_VCPUS unconditionally Date: Tue, 23 Apr 2013 18:30:36 +0200 Message-Id: <1366734653-488286-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1366734653-488286-1-git-send-email-arnd@arndb.de> References: <1366734653-488286-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:e1UQDr9GydndNi0hAYeQbAwYbv7U8N3t0gq338WlM2D wj8Kpql3YnXzqJrRnfI/5auXCaSSqeUM+dqzu8T7rSw7nSuHxS hGx+XH2pu7MzuGnsPhcztjLaY1e6BtkhmIgCkSTRcP24aIe3EJ QV0JtuJg8Q6C2Ukw6YHyrjPKrLfoYEtwsDisj9fG3UGj7Z/DDc 9BhrR7YWvmqYvkQKcWvcpbgTdIjMo4LpPluV8iT62uonGsMHh+ MPuvSRO43mqZSCESQwZP8GGCyT80lLJfiB8IPFZ2wKQBAwOla8 +7J+aGLSoeVuGEBtYNGKNK+iY/EPyL4WHOKGXRAU08Nn5QSmbe 8Sopwf5ENCCdavx71WVvlpm1qTR6b7wL8FLZRM9Ot Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2139 Lines: 56 The CONFIG_KVM_ARM_MAX_VCPUS symbol is needed in order to build the kernel/context_tracking.c code, which includes the vgic data structures implictly through the kvm headers. Definining the symbol to zero on builds without KVM resolves this build error: In file included from include/linux/kvm_host.h:33:0, from kernel/context_tracking.c:18: arch/arm/include/asm/kvm_host.h:28:23: warning: "CONFIG_KVM_ARM_MAX_VCPUS" is not defined [-Wundef] #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS ^ arch/arm/include/asm/kvm_vgic.h:34:24: note: in expansion of macro 'KVM_MAX_VCPUS' #define VGIC_MAX_CPUS KVM_MAX_VCPUS ^ arch/arm/include/asm/kvm_vgic.h:38:6: note: in expansion of macro 'VGIC_MAX_CPUS' #if (VGIC_MAX_CPUS > 8) ^ In file included from arch/arm/include/asm/kvm_host.h:41:0, from include/linux/kvm_host.h:33, from kernel/context_tracking.c:18: arch/arm/include/asm/kvm_vgic.h:59:11: error: 'CONFIG_KVM_ARM_MAX_VCPUS' undeclared here (not in a function) } percpu[VGIC_MAX_CPUS]; ^ Signed-off-by: Arnd Bergmann Cc: Marc Zyngier Cc: Christoffer Dall Cc: Will Deacon --- arch/arm/kvm/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig index 49dd64e..370e1a8 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig @@ -41,9 +41,9 @@ config KVM_ARM_HOST Provides host support for ARM processors. config KVM_ARM_MAX_VCPUS - int "Number maximum supported virtual CPUs per VM" - depends on KVM_ARM_HOST - default 4 + int "Number maximum supported virtual CPUs per VM" if KVM_ARM_HOST + default 4 if KVM_ARM_HOST + default 0 help Static number of max supported virtual CPUs per VM. -- 1.8.1.2 -- 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/