OSDN Git Service

ARM: KVM: fix vgic-disabled build
authorArnd Bergmann <arnd@arndb.de>
Tue, 30 Sep 2014 11:38:20 +0000 (13:38 +0200)
committerChristoffer Dall <christoffer.dall@linaro.org>
Tue, 7 Oct 2014 10:30:16 +0000 (12:30 +0200)
commitb5e7a955a3515bf6b568050533fa9b1b72460a95
tree4d24946a41cd73509b5ff855b12b174b4f9ad6c9
parent37a34ac1d4775aafbc73b9db53c7daebbbc67e6a
ARM: KVM: fix vgic-disabled build

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