From patchwork Tue Apr 30 14:49:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 2505151 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 8AC7BDF5B1 for ; Tue, 30 Apr 2013 14:50:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932419Ab3D3OuZ (ORCPT ); Tue, 30 Apr 2013 10:50:25 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:48179 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932440Ab3D3OuL (ORCPT ); Tue, 30 Apr 2013 10:50:11 -0400 Received: by mail-pd0-f180.google.com with SMTP id u10so345682pdi.25 for ; Tue, 30 Apr 2013 07:50:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=oKtWUgpKQ/EHHxfBARFyw+3mFc2fYNejCkS/AMCxO0c=; b=ndNaYNx2w4pbEdgJY1Z/lPSY4VZrd5cdkBCxegkLB3qRKuhbOevjq46N460BmOII8U i71vTIIJWLhu6Oh8CfhOnQ7TVXiLB/FHP8EyIKutsKNMs305AqwJv8nlr0Jzd7JWvqaN +fieE55M09XInC2dFFHXszEv75sDmMPQVZ8DznNvWnno0pwlzKoC+4GJRhccnP31jeWL 4MY5TtZP0jHYVPlRRTR/u7BUThnqOw1X0iF/3LN2bjBFPnoLZOaF+/r01Cuh7vWZ008q H7s8n5kvmXn7H85+BpZiB8WZ3PVRBk8TNTFVj3KoAYXjq5d5wwJAYWZwdtJDwLpZL00N WSng== X-Received: by 10.66.222.228 with SMTP id qp4mr65187916pac.113.1367333410594; Tue, 30 Apr 2013 07:50:10 -0700 (PDT) Received: from localhost.localdomain (c-67-169-183-77.hsd1.ca.comcast.net. [67.169.183.77]) by mx.google.com with ESMTPSA id cq1sm28799244pbc.13.2013.04.30.07.50.09 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Apr 2013 07:50:10 -0700 (PDT) From: Christoffer Dall To: kvm@vger.kernel.org Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Marc Zyngier , Christoffer Dall , Will Deacon Subject: [PATCH 13/15] ARM: KVM: define KVM_ARM_MAX_VCPUS unconditionally Date: Tue, 30 Apr 2013 07:49:34 -0700 Message-Id: <1367333376-30983-14-git-send-email-cdall@cs.columbia.edu> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1367333376-30983-1-git-send-email-cdall@cs.columbia.edu> References: <1367333376-30983-1-git-send-email-cdall@cs.columbia.edu> X-Gm-Message-State: ALoCoQku+GApKOFENDOS0g5OGSDcPbTfQVB3BuXXG18bzNqeWyK2AJ+ZHWKRxu0dfLcUzTSsD/jX Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Arnd Bergmann 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 Signed-off-by: Christoffer Dall --- 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.