From 3acbdb6a3884b77dfe75dd03c2f487ca42275d05 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 19 Feb 2010 11:00:41 +0100
Subject: [PATCH] --- yaml --- r: 197607 b: refs/heads/master c:
 dba2e123e7502870c965e4b445554bc8e56f78b2 h: refs/heads/master i:   197605:
 3371428aae453190278772ce783790d8804607fb   197603:
 5405d39a43ddb52032740ea848c31c3a05f9ea04   197599:
 9e7540df1da17a3e570c5707400c4b1ba72689fc v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/kvm/book3s_64_emulate.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7afa97bc1fe9..2f6b9445fe96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 963cf3dc6342fe60bb78c615884537621abca0bc
+refs/heads/master: dba2e123e7502870c965e4b445554bc8e56f78b2
diff --git a/trunk/arch/powerpc/kvm/book3s_64_emulate.c b/trunk/arch/powerpc/kvm/book3s_64_emulate.c
index a93aa4719178..1d1b9524f0e4 100644
--- a/trunk/arch/powerpc/kvm/book3s_64_emulate.c
+++ b/trunk/arch/powerpc/kvm/book3s_64_emulate.c
@@ -233,13 +233,13 @@ static void kvmppc_write_bat(struct kvm_vcpu *vcpu, int sprn, u32 val)
 		bat = &vcpu_book3s->ibat[(sprn - SPRN_IBAT0U) / 2];
 		break;
 	case SPRN_IBAT4U ... SPRN_IBAT7L:
-		bat = &vcpu_book3s->ibat[(sprn - SPRN_IBAT4U) / 2];
+		bat = &vcpu_book3s->ibat[4 + ((sprn - SPRN_IBAT4U) / 2)];
 		break;
 	case SPRN_DBAT0U ... SPRN_DBAT3L:
 		bat = &vcpu_book3s->dbat[(sprn - SPRN_DBAT0U) / 2];
 		break;
 	case SPRN_DBAT4U ... SPRN_DBAT7L:
-		bat = &vcpu_book3s->dbat[(sprn - SPRN_DBAT4U) / 2];
+		bat = &vcpu_book3s->dbat[4 + ((sprn - SPRN_DBAT4U) / 2)];
 		break;
 	default:
 		BUG();