aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiu Yu <yu.liu@freescale.com>2009-01-14 11:47:37 -0500
committerAvi Kivity <avi@redhat.com>2009-03-24 05:03:05 -0400
commitfb2838d446f6ee7e13e4149e08ec138753c5c450 (patch)
treeae7e5d59cbcfe2b7f9651e78e4066c8d6ecb8b67
parent87c656b4147cd08c6efba95d8d70c12cba181255 (diff)
KVM: ppc: Fix e500 warnings and some spelling problems
Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/powerpc/kvm/e500_emulate.c2
-rw-r--r--arch/powerpc/kvm/e500_tlb.c6
-rw-r--r--arch/powerpc/kvm/e500_tlb.h2
3 files changed, 4 insertions, 6 deletions
diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index d3c0c7c7f209..7a98d4a4c1ed 100644
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -30,8 +30,6 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
30 int emulated = EMULATE_DONE; 30 int emulated = EMULATE_DONE;
31 int ra; 31 int ra;
32 int rb; 32 int rb;
33 int rs;
34 int rt;
35 33
36 switch (get_op(inst)) { 34 switch (get_op(inst)) {
37 case 31: 35 case 31:
diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index 6a50340f575e..e3daf57b5f5e 100644
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/arch/powerpc/kvm/e500_tlb.c
@@ -260,7 +260,7 @@ static inline void kvmppc_e500_deliver_tlb_miss(struct kvm_vcpu *vcpu,
260 unsigned int victim, pidsel, tsized; 260 unsigned int victim, pidsel, tsized;
261 int tlbsel; 261 int tlbsel;
262 262
263 /* since we only have tow TLBs, only lower bit is used. */ 263 /* since we only have two TLBs, only lower bit is used. */
264 tlbsel = (vcpu_e500->mas4 >> 28) & 0x1; 264 tlbsel = (vcpu_e500->mas4 >> 28) & 0x1;
265 victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0; 265 victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;
266 pidsel = (vcpu_e500->mas4 >> 16) & 0xf; 266 pidsel = (vcpu_e500->mas4 >> 16) & 0xf;
@@ -402,7 +402,7 @@ int kvmppc_e500_emul_tlbivax(struct kvm_vcpu *vcpu, int ra, int rb)
402 402
403 ia = (ea >> 2) & 0x1; 403 ia = (ea >> 2) & 0x1;
404 404
405 /* since we only have tow TLBs, only lower bit is used. */ 405 /* since we only have two TLBs, only lower bit is used. */
406 tlbsel = (ea >> 3) & 0x1; 406 tlbsel = (ea >> 3) & 0x1;
407 407
408 if (ia) { 408 if (ia) {
@@ -471,7 +471,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, int rb)
471 } else { 471 } else {
472 int victim; 472 int victim;
473 473
474 /* since we only have tow TLBs, only lower bit is used. */ 474 /* since we only have two TLBs, only lower bit is used. */
475 tlbsel = vcpu_e500->mas4 >> 28 & 0x1; 475 tlbsel = vcpu_e500->mas4 >> 28 & 0x1;
476 victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0; 476 victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;
477 477
diff --git a/arch/powerpc/kvm/e500_tlb.h b/arch/powerpc/kvm/e500_tlb.h
index d8833f955163..ab49e9355185 100644
--- a/arch/powerpc/kvm/e500_tlb.h
+++ b/arch/powerpc/kvm/e500_tlb.h
@@ -126,7 +126,7 @@ static inline unsigned int get_tlb_tlbsel(
126{ 126{
127 /* 127 /*
128 * Manual says that tlbsel has 2 bits wide. 128 * Manual says that tlbsel has 2 bits wide.
129 * Since we only have tow TLBs, only lower bit is used. 129 * Since we only have two TLBs, only lower bit is used.
130 */ 130 */
131 return (vcpu_e500->mas0 >> 28) & 0x1; 131 return (vcpu_e500->mas0 >> 28) & 0x1;
132} 132}