From d758573244633884077d9dbdc05f177a3f3cbae4 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Mon, 21 Jun 2010 15:24:55 +0200
Subject: [PATCH] --- yaml --- r: 202370 b: refs/heads/master c:
 4d29bdbf12f35f7e7816d67e99c150630684604f h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/powerpc/kvm/book3s_32_mmu.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6b7d136ab3f6..b56eb34faa66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b249157c03154109d31ec95a3c80203adcf8b70
+refs/heads/master: 4d29bdbf12f35f7e7816d67e99c150630684604f
diff --git a/trunk/arch/powerpc/kvm/book3s_32_mmu.c b/trunk/arch/powerpc/kvm/book3s_32_mmu.c
index 0b10503c8a4a..3292d76101d2 100644
--- a/trunk/arch/powerpc/kvm/book3s_32_mmu.c
+++ b/trunk/arch/powerpc/kvm/book3s_32_mmu.c
@@ -354,10 +354,10 @@ static int kvmppc_mmu_book3s_32_esid_to_vsid(struct kvm_vcpu *vcpu, ulong esid,
 		*vsid = VSID_REAL_DR | gvsid;
 		break;
 	case MSR_DR|MSR_IR:
-		if (!sr->valid)
-			return -1;
-
-		*vsid = sr->vsid;
+		if (sr->valid)
+			*vsid = sr->vsid;
+		else
+			*vsid = VSID_BAT | gvsid;
 		break;
 	default:
 		BUG();