From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/12] ARM: KVM: fix vgic-disabled build
Date: Sat, 18 Oct 2014 12:56:52 +0100 [thread overview]
Message-ID: <1413633422-14907-3-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1413633422-14907-1-git-send-email-marc.zyngier@arm.com>
From: Arnd Bergmann <arnd@arndb.de>
The vgic code can be disabled in Kconfig and there are dummy implementations
of most of the provided API functions for the disabled case.
However, the newly introduced kvm_vgic_destroy/kvm_vgic_vcpu_destroy
functions are lacking those dummies, resulting in this build error:
arch/arm/kvm/arm.c: In function 'kvm_arch_destroy_vm':
arch/arm/kvm/arm.c:165:2: error: implicit declaration of function 'kvm_vgic_destroy' [-Werror=implicit-function-declaration]
kvm_vgic_destroy(kvm);
^
arch/arm/kvm/arm.c: In function 'kvm_arch_vcpu_free':
arch/arm/kvm/arm.c:248:2: error: implicit declaration of function 'kvm_vgic_vcpu_destroy' [-Werror=implicit-function-declaration]
kvm_vgic_vcpu_destroy(vcpu);
^
This adds two inline helpers to get it to build again in this configuration.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: c1bfb577add ("arm/arm64: KVM: vgic: switch to dynamic allocation")
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
include/kvm/arm_vgic.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index 2f2aac8..ec559d3 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -331,6 +331,14 @@ static inline int kvm_vgic_create(struct kvm *kvm)
return 0;
}
+static inline void kvm_vgic_destroy(struct kvm *kvm)
+{
+}
+
+static inline void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)
+{
+}
+
static inline int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
{
return 0;
--
2.1.1
next prev parent reply other threads:[~2014-10-18 11:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-18 11:56 [GIT PULL] Second pull request for KVM on arm/arm64 for 3.18 Marc Zyngier
2014-10-18 11:56 ` [PATCH 01/12] arm: kvm: fix CPU hotplug Marc Zyngier
2014-10-18 11:56 ` Marc Zyngier [this message]
2014-10-18 11:56 ` [PATCH 03/12] arm/arm64: KVM: use __GFP_ZERO not memset() to get zeroed pages Marc Zyngier
2014-10-18 11:56 ` [PATCH 04/12] arm/arm64: KVM: fix potential NULL dereference in user_mem_abort() Marc Zyngier
2014-10-18 11:56 ` [PATCH 05/12] arm/arm64: KVM: add 'writable' parameter to kvm_phys_addr_ioremap Marc Zyngier
2014-10-18 11:56 ` [PATCH 06/12] ARM: kvm: define PAGE_S2_DEVICE as read-only by default Marc Zyngier
2014-10-18 11:56 ` [PATCH 07/12] arm64: " Marc Zyngier
2014-10-18 11:56 ` [PATCH 08/12] arm/arm64: KVM: map MMIO regions at creation time Marc Zyngier
2014-10-18 11:56 ` [PATCH 09/12] arm64: KVM: Implement 48 VA support for KVM EL2 and Stage-2 Marc Zyngier
2014-10-18 11:57 ` [PATCH 10/12] arm/arm64: KVM: Ensure memslots are within KVM_PHYS_SIZE Marc Zyngier
2014-10-18 11:57 ` [PATCH 11/12] arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort Marc Zyngier
2014-10-18 11:57 ` [PATCH 12/12] arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413633422-14907-3-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).