From 278e3cb475457a8453f0f7e3fc5cd3f195abfa75 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 1 Apr 2010 15:33:21 +0200 Subject: [PATCH] --- yaml --- r: 197733 b: refs/heads/master c: 287d5611fab5a42214d028b6f67fbd2ee977dcf2 h: refs/heads/master i: 197731: f1f49c15c378cf344d013d54a5b9cbcf4faec1ab v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/powerpc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 62a9abe7cee6..e01a1d1275b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 647dc49eebad2c30f823cae2bd8204b66c739f9c +refs/heads/master: 287d5611fab5a42214d028b6f67fbd2ee977dcf2 diff --git a/trunk/arch/powerpc/kvm/powerpc.c b/trunk/arch/powerpc/kvm/powerpc.c index 9a4dd8146d39..ffbe4cac5b15 100644 --- a/trunk/arch/powerpc/kvm/powerpc.c +++ b/trunk/arch/powerpc/kvm/powerpc.c @@ -335,6 +335,7 @@ static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu, case KVM_REG_FPR: vcpu->arch.fpr[vcpu->arch.io_gpr & KVM_REG_MASK] = gpr; break; +#ifdef CONFIG_PPC_BOOK3S case KVM_REG_QPR: vcpu->arch.qpr[vcpu->arch.io_gpr & KVM_REG_MASK] = gpr; break; @@ -342,6 +343,7 @@ static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu, vcpu->arch.fpr[vcpu->arch.io_gpr & KVM_REG_MASK] = gpr; vcpu->arch.qpr[vcpu->arch.io_gpr & KVM_REG_MASK] = gpr; break; +#endif default: BUG(); }