From 798976f3c912413f7a8e1997fc766795ce315471 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 16 Apr 2010 00:11:39 +0200
Subject: [PATCH] --- yaml --- r: 197771 b: refs/heads/master c:
 66bb170655799a0149df0844fb8232f27e54323c h: refs/heads/master i:   197769:
 88fbe81b512b6aeee1f3e52c85e4eec69e3f2f5e   197767:
 fb8431eca991b3cfbf5813cfe0e917bc02546c9f v: v3

---
 [refs]                                        |  2 +-
 .../arch/powerpc/include/asm/kvm_book3s_asm.h | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bb7cbc80f6c9..06480cbab02e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c60b9fb0f9dca8adb0143456245041e7a036c2f
+refs/heads/master: 66bb170655799a0149df0844fb8232f27e54323c
diff --git a/trunk/arch/powerpc/include/asm/kvm_book3s_asm.h b/trunk/arch/powerpc/include/asm/kvm_book3s_asm.h
index 183461b48407..e915e7dfa622 100644
--- a/trunk/arch/powerpc/include/asm/kvm_book3s_asm.h
+++ b/trunk/arch/powerpc/include/asm/kvm_book3s_asm.h
@@ -63,12 +63,33 @@ struct kvmppc_book3s_shadow_vcpu {
 	ulong gpr[14];
 	u32 cr;
 	u32 xer;
+
+	u32 fault_dsisr;
+	u32 last_inst;
+	ulong ctr;
+	ulong lr;
+	ulong pc;
+	ulong shadow_srr1;
+	ulong fault_dar;
+
 	ulong host_r1;
 	ulong host_r2;
 	ulong handler;
 	ulong scratch0;
 	ulong scratch1;
 	ulong vmhandler;
+	u8 in_guest;
+
+#ifdef CONFIG_PPC_BOOK3S_32
+	u32     sr[16];			/* Guest SRs */
+#endif
+#ifdef CONFIG_PPC_BOOK3S_64
+	u8 slb_max;			/* highest used guest slb entry */
+	struct  {
+		u64     esid;
+		u64     vsid;
+	} slb[64];			/* guest SLB */
+#endif
 };
 
 #endif /*__ASSEMBLY__ */