From 50afc4a9cc22a324761dcd99c54fe8f04b0590fe Mon Sep 17 00:00:00 2001
From: Liu Yu <yu.liu@freescale.com>
Date: Wed, 14 Jan 2009 10:47:37 -0600
Subject: [PATCH] --- yaml --- r: 133724 b: refs/heads/master c:
 fb2838d446f6ee7e13e4149e08ec138753c5c450 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/kvm/e500_emulate.c | 2 --
 trunk/arch/powerpc/kvm/e500_tlb.c     | 6 +++---
 trunk/arch/powerpc/kvm/e500_tlb.h     | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7c7db4761c22..ae4604ecaea6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87c656b4147cd08c6efba95d8d70c12cba181255
+refs/heads/master: fb2838d446f6ee7e13e4149e08ec138753c5c450
diff --git a/trunk/arch/powerpc/kvm/e500_emulate.c b/trunk/arch/powerpc/kvm/e500_emulate.c
index d3c0c7c7f209..7a98d4a4c1ed 100644
--- a/trunk/arch/powerpc/kvm/e500_emulate.c
+++ b/trunk/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 ra;
 	int rb;
-	int rs;
-	int rt;
 
 	switch (get_op(inst)) {
 	case 31:
diff --git a/trunk/arch/powerpc/kvm/e500_tlb.c b/trunk/arch/powerpc/kvm/e500_tlb.c
index 6a50340f575e..e3daf57b5f5e 100644
--- a/trunk/arch/powerpc/kvm/e500_tlb.c
+++ b/trunk/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;
 	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;
 	victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;
 	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;
 
-	/* 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;
 
 	if (ia) {
@@ -471,7 +471,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, int rb)
 	} else {
 		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;
 		victim = (tlbsel == 0) ? tlb0_get_next_victim(vcpu_e500) : 0;
 
diff --git a/trunk/arch/powerpc/kvm/e500_tlb.h b/trunk/arch/powerpc/kvm/e500_tlb.h
index d8833f955163..ab49e9355185 100644
--- a/trunk/arch/powerpc/kvm/e500_tlb.h
+++ b/trunk/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.
-	 * 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;
 }