diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 17:22:29 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-25 17:22:29 +0900 |
commit | b79b3e05b1229d5b2fc2af71dc29701642577eba (patch) | |
tree | bcdf728ccfab02d66e129cacaa106bf8cc60f2d6 /arch/powerpc/kvm/e500_emulate.c | |
parent | b8e513a2ecafb5bb068c00be98d584871afcd4c3 (diff) | |
parent | c5ad48f3117c4aae379b536f3270fc1efae945c0 (diff) | |
download | talos-obmc-linux-b79b3e05b1229d5b2fc2af71dc29701642577eba.tar.gz talos-obmc-linux-b79b3e05b1229d5b2fc2af71dc29701642577eba.zip |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'arch/powerpc/kvm/e500_emulate.c')
-rw-r--r-- | arch/powerpc/kvm/e500_emulate.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c index 69cd665a0caf..d48ae396f41e 100644 --- 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; |