Browse Source

KVM: ppc: Fix e500 warnings and some spelling problems

Signed-off-by: Avi Kivity <avi@redhat.com>
Liu Yu 16 years ago
parent
commit
fb2838d446
3 changed files with 4 additions and 6 deletions
  1. 0 2
      arch/powerpc/kvm/e500_emulate.c
  2. 3 3
      arch/powerpc/kvm/e500_tlb.c
  3. 1 1
      arch/powerpc/kvm/e500_tlb.h

+ 0 - 2
arch/powerpc/kvm/e500_emulate.c

@@ -30,8 +30,6 @@ int kvmppc_core_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
 	int emulated = EMULATE_DONE;
 	int emulated = EMULATE_DONE;
 	int ra;
 	int ra;
 	int rb;
 	int rb;
-	int rs;
-	int rt;
 
 
 	switch (get_op(inst)) {
 	switch (get_op(inst)) {
 	case 31:
 	case 31:

+ 3 - 3
arch/powerpc/kvm/e500_tlb.c

@@ -260,7 +260,7 @@ static inline void kvmppc_e500_deliver_tlb_miss(struct kvm_vcpu *vcpu,
 	unsigned int victim, pidsel, tsized;
 	unsigned int victim, pidsel, tsized;
 	int tlbsel;
 	int tlbsel;
 
 
-	/* since we only have tow TLBs, only lower bit is used. */
+	/* since we only have two TLBs, only lower bit is used. */
 	tlbsel = (vcpu_e500->mas4 >> 28) & 0x1;
 	tlbsel = (vcpu_e500->mas4 >> 28) & 0x1;
 	victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;
 	victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;
 	pidsel = (vcpu_e500->mas4 >> 16) & 0xf;
 	pidsel = (vcpu_e500->mas4 >> 16) & 0xf;
@@ -402,7 +402,7 @@ int kvmppc_e500_emul_tlbivax(struct kvm_vcpu *vcpu, int ra, int rb)
 
 
 	ia = (ea >> 2) & 0x1;
 	ia = (ea >> 2) & 0x1;
 
 
-	/* since we only have tow TLBs, only lower bit is used. */
+	/* since we only have two TLBs, only lower bit is used. */
 	tlbsel = (ea >> 3) & 0x1;
 	tlbsel = (ea >> 3) & 0x1;
 
 
 	if (ia) {
 	if (ia) {
@@ -471,7 +471,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, int rb)
 	} else {
 	} else {
 		int victim;
 		int victim;
 
 
-		/* since we only have tow TLBs, only lower bit is used. */
+		/* since we only have two TLBs, only lower bit is used. */
 		tlbsel = vcpu_e500->mas4 >> 28 & 0x1;
 		tlbsel = vcpu_e500->mas4 >> 28 & 0x1;
 		victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;
 		victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;
 
 

+ 1 - 1
arch/powerpc/kvm/e500_tlb.h

@@ -126,7 +126,7 @@ static inline unsigned int get_tlb_tlbsel(
 {
 {
 	/*
 	/*
 	 * Manual says that tlbsel has 2 bits wide.
 	 * Manual says that tlbsel has 2 bits wide.
-	 * Since we only have tow TLBs, only lower bit is used.
+	 * Since we only have two TLBs, only lower bit is used.
 	 */
 	 */
 	return (vcpu_e500->mas0 >> 28) & 0x1;
 	return (vcpu_e500->mas0 >> 28) & 0x1;
 }
 }