[COMMIT master] KVM: PPC: Make build work without CONFIG_VSX/ALTIVEC

[Avi Kivity]

From: Alexander Graf <ag...@suse.de>

The FPU/Altivec/VSX enablement also brought access to some structure
elements that are only defined when the respective config options
are enabled.

Unfortuately I forgot to check for the config options at some places,
so let's do that now.

Unbreaks the build when CONFIG_VSX is not set.

Signed-off-by: Alexander Graf <ag...@suse.de>
Signed-off-by: Avi Kivity <a...@redhat.com>

diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
index d6105d9..7912d72 100644
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
@@ -608,7 +608,9 @@ void kvmppc_giveup_ext(struct kvm_vcpu *vcpu, ulong msr)
 {
        struct thread_struct *t = &current->thread;
        u64 *vcpu_fpr = vcpu->arch.fpr;
+#ifdef CONFIG_VSX
        u64 *vcpu_vsx = vcpu->arch.vsr;
+#endif
        u64 *thread_fpr = (u64*)t->fpr;
        int i;
 
@@ -688,7 +690,9 @@ static int kvmppc_handle_ext(struct kvm_vcpu *vcpu, 
unsigned int exit_nr,
 {
        struct thread_struct *t = &current->thread;
        u64 *vcpu_fpr = vcpu->arch.fpr;
+#ifdef CONFIG_VSX
        u64 *vcpu_vsx = vcpu->arch.vsr;
+#endif
        u64 *thread_fpr = (u64*)t->fpr;
        int i;
 
@@ -1219,8 +1223,12 @@ int __kvmppc_vcpu_run(struct kvm_run *kvm_run, struct 
kvm_vcpu *vcpu)
 {
        int ret;
        struct thread_struct ext_bkp;
+#ifdef CONFIG_ALTIVEC
        bool save_vec = current->thread.used_vr;
+#endif
+#ifdef CONFIG_VSX
        bool save_vsx = current->thread.used_vsr;
+#endif
        ulong ext_msr;
 
        /* No need to go into the guest when all we do is going out */
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html