From be2548270b331d06422432e333911b5c5f6bec41 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 16 Apr 2010 00:11:51 +0200
Subject: [PATCH] --- yaml --- r: 197783 b: refs/heads/master c:
 97e492558f423d99c51eb934506b7a3d7c64613b h: refs/heads/master i:   197781:
 97281767d2fc4ce7e92ed7e7428ef8eec946c5c5   197779:
 5f8b5719f7cda0cfccf565ba5522616e4036908f   197775:
 015366de85f2c91ca990b388dd0c0c0dc038cc5f v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/include/asm/processor.h | 3 +++
 trunk/arch/powerpc/kernel/asm-offsets.c    | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6b8c2aa47de4..e91ef3013636 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0474b259d0366a70ea83b94534c333093c189421
+refs/heads/master: 97e492558f423d99c51eb934506b7a3d7c64613b
diff --git a/trunk/arch/powerpc/include/asm/processor.h b/trunk/arch/powerpc/include/asm/processor.h
index 221ba6240464..7492fe8ad6e4 100644
--- a/trunk/arch/powerpc/include/asm/processor.h
+++ b/trunk/arch/powerpc/include/asm/processor.h
@@ -229,6 +229,9 @@ struct thread_struct {
 	unsigned long	spefscr;	/* SPE & eFP status */
 	int		used_spe;	/* set if process has used spe */
 #endif /* CONFIG_SPE */
+#ifdef CONFIG_KVM_BOOK3S_32_HANDLER
+	void*		kvm_shadow_vcpu; /* KVM internal data */
+#endif /* CONFIG_KVM_BOOK3S_32_HANDLER */
 };
 
 #define ARCH_MIN_TASKALIGN 16
diff --git a/trunk/arch/powerpc/kernel/asm-offsets.c b/trunk/arch/powerpc/kernel/asm-offsets.c
index e8003ff81eef..1804c2cd1dfd 100644
--- a/trunk/arch/powerpc/kernel/asm-offsets.c
+++ b/trunk/arch/powerpc/kernel/asm-offsets.c
@@ -108,6 +108,9 @@ int main(void)
 	DEFINE(THREAD_USED_SPE, offsetof(struct thread_struct, used_spe));
 #endif /* CONFIG_SPE */
 #endif /* CONFIG_PPC64 */
+#ifdef CONFIG_KVM_BOOK3S_32_HANDLER
+	DEFINE(THREAD_KVM_SVCPU, offsetof(struct thread_struct, kvm_shadow_vcpu));
+#endif
 
 	DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
 	DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags));