From patchwork Fri Apr 24 05:27:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 47513 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3B8F520553 for ; Fri, 24 Apr 2015 05:32:12 +0000 (UTC) Received: by laat2 with SMTP id t2sf9434543laa.2 for ; Thu, 23 Apr 2015 22:32:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=Skz4Z16zXgwVGkF8tv5JNZWNrNS8EoSPQp17ep+19Bk=; b=IpvyduqxsrydIbQgi9xW5ioFruLz5n9pWN0dpQIW7Kp2jx4ZTiED0LGKEwDmHEsi1j w/8CI+bH+a41u/Xzw2YDYy3DtU6VybtZbkN1XS6lKefupdYwidU2tqUaup4DPZbsKyCE 5HvROrTbOKnpMGBye54jXxt9D637O5MsxSYgmW6tyZSN/wI7+rnIQtNc0fchSZdjeAKR 1MOZ0IJyGXbtOmA8oASvxaYK9185Wyec2juPh7KFCEqrPoL+w2yR3vwuO4K2blDUABrG /mrn2gsZy2i5qxqQNoyl6kLo9sIbsQjOVh26eOANxXdLcueGoYZXq6OXo0Pwuz7JtvXK Ayzw== X-Gm-Message-State: ALoCoQkbeiM+K8d8dipYtCuHWmgcfkNR/SPynKse1pA4YQTlDuijIf6IJRnDa5RRwVo+ZfobD2IX X-Received: by 10.112.166.137 with SMTP id zg9mr3261374lbb.11.1429853531219; Thu, 23 Apr 2015 22:32:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.236 with SMTP id uh12ls442755lac.54.gmail; Thu, 23 Apr 2015 22:32:11 -0700 (PDT) X-Received: by 10.152.2.105 with SMTP id 9mr5369498lat.16.1429853530976; Thu, 23 Apr 2015 22:32:10 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id g1si7482701lbs.32.2015.04.23.22.32.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2015 22:32:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by laat2 with SMTP id t2so27561897laa.1 for ; Thu, 23 Apr 2015 22:32:10 -0700 (PDT) X-Received: by 10.152.87.204 with SMTP id ba12mr5549908lab.35.1429853530892; Thu, 23 Apr 2015 22:32:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp977904lbt; Thu, 23 Apr 2015 22:32:10 -0700 (PDT) X-Received: by 10.66.221.34 with SMTP id qb2mr11692465pac.42.1429853529161; Thu, 23 Apr 2015 22:32:09 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bd10si15800741pdb.178.2015.04.23.22.32.08; Thu, 23 Apr 2015 22:32:09 -0700 (PDT) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754539AbbDXFcH (ORCPT + 2 others); Fri, 24 Apr 2015 01:32:07 -0400 Received: from mail-ob0-f169.google.com ([209.85.214.169]:32869 "EHLO mail-ob0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754536AbbDXFcH (ORCPT ); Fri, 24 Apr 2015 01:32:07 -0400 Received: by oblw8 with SMTP id w8so30268007obl.0 for ; Thu, 23 Apr 2015 22:32:06 -0700 (PDT) X-Received: by 10.202.66.198 with SMTP id p189mr5432672oia.45.1429853526630; Thu, 23 Apr 2015 22:32:06 -0700 (PDT) Received: from localhost ([167.160.116.36]) by mx.google.com with ESMTPSA id v75sm6100594oie.4.2015.04.23.22.32.04 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 23 Apr 2015 22:32:05 -0700 (PDT) From: shannon.zhao@linaro.org To: stable@vger.kernel.org Cc: jslaby@suse.cz, christoffer.dall@linaro.org, shannon.zhao@linaro.org, Marc Zyngier , Paolo Bonzini Subject: [PATCH for 3.12.y stable 28/63] ARM: KVM: fix non-VGIC compilation Date: Fri, 24 Apr 2015 13:27:26 +0800 Message-Id: <1429853281-6136-29-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> References: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shannon.zhao@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Marc Zyngier commit 6cbde8253a8143ada18ec0d1711230747a7c1934 upstream. Add a stub for kvm_vgic_addr when compiling without CONFIG_KVM_ARM_VGIC. The usefulness of this configurarion is extremely doubtful, but let's fix it anyway (until we decide that we'll always support a VGIC). Reported-by: Michele Paolino Cc: Paolo Bonzini Cc: Christoffer Dall Signed-off-by: Marc Zyngier Signed-off-by: Paolo Bonzini Signed-off-by: Shannon Zhao --- include/kvm/arm_vgic.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 7e2d158..a15ae2a 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -171,6 +171,11 @@ static inline int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 add return 0; } +static inline int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write) +{ + return -ENXIO; +} + static inline int kvm_vgic_init(struct kvm *kvm) { return 0;