Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[pandora-kernel.git] / arch / powerpc / kvm / e500_emulate.c

diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index 69cd665..d48ae39 100644 (file)
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -81,8 +81,12 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
                kvmppc_set_pid(vcpu, spr_val);
                break;
        case SPRN_PID1:
+               if (spr_val != 0)
+                       return EMULATE_FAIL;
                vcpu_e500->pid[1] = spr_val; break;
        case SPRN_PID2:
+               if (spr_val != 0)
+                       return EMULATE_FAIL;
                vcpu_e500->pid[2] = spr_val; break;
        case SPRN_MAS0:
                vcpu_e500->mas0 = spr_val; break;