From cbca426636a9464169c76db27ad577d9be942836 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 16 Apr 2010 00:11:41 +0200
Subject: [PATCH] --- yaml --- r: 197773 b: refs/heads/master c:
 c14dea04a248a59fe01f1b49ac94615042016558 h: refs/heads/master i:   197771:
 798976f3c912413f7a8e1997fc766795ce315471 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/powerpc/include/asm/kvm_book3s_asm.h | 4 ++--
 trunk/arch/powerpc/include/asm/paca.h           | 2 +-
 trunk/arch/powerpc/kvm/Kconfig                  | 4 ++++
 trunk/arch/powerpc/kvm/Makefile                 | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5a321c751050..5ab397fc9f07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7f38f46f2a98d232147e47284cb4e7363296a3e
+refs/heads/master: c14dea04a248a59fe01f1b49ac94615042016558
diff --git a/trunk/arch/powerpc/include/asm/kvm_book3s_asm.h b/trunk/arch/powerpc/include/asm/kvm_book3s_asm.h
index e915e7dfa622..36fdb3aff30b 100644
--- a/trunk/arch/powerpc/include/asm/kvm_book3s_asm.h
+++ b/trunk/arch/powerpc/include/asm/kvm_book3s_asm.h
@@ -22,7 +22,7 @@
 
 #ifdef __ASSEMBLY__
 
-#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
+#ifdef CONFIG_KVM_BOOK3S_HANDLER
 
 #include <asm/kvm_asm.h>
 
@@ -55,7 +55,7 @@ kvmppc_resume_\intno:
 .macro DO_KVM intno
 .endm
 
-#endif /* CONFIG_KVM_BOOK3S_64_HANDLER */
+#endif /* CONFIG_KVM_BOOK3S_HANDLER */
 
 #else  /*__ASSEMBLY__ */
 
diff --git a/trunk/arch/powerpc/include/asm/paca.h b/trunk/arch/powerpc/include/asm/paca.h
index dc3ccdf81996..33347ea4b47a 100644
--- a/trunk/arch/powerpc/include/asm/paca.h
+++ b/trunk/arch/powerpc/include/asm/paca.h
@@ -136,7 +136,7 @@ struct paca_struct {
 	u64 startpurr;			/* PURR/TB value snapshot */
 	u64 startspurr;			/* SPURR value snapshot */
 
-#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
+#ifdef CONFIG_KVM_BOOK3S_HANDLER
 	struct  {
 		u64     esid;
 		u64     vsid;
diff --git a/trunk/arch/powerpc/kvm/Kconfig b/trunk/arch/powerpc/kvm/Kconfig
index 60624cc9f4d4..8ef37664fda1 100644
--- a/trunk/arch/powerpc/kvm/Kconfig
+++ b/trunk/arch/powerpc/kvm/Kconfig
@@ -22,8 +22,12 @@ config KVM
 	select ANON_INODES
 	select KVM_MMIO
 
+config KVM_BOOK3S_HANDLER
+	bool
+
 config KVM_BOOK3S_64_HANDLER
 	bool
+	select KVM_BOOK3S_HANDLER
 
 config KVM_BOOK3S_64
 	tristate "KVM support for PowerPC book3s_64 processors"
diff --git a/trunk/arch/powerpc/kvm/Makefile b/trunk/arch/powerpc/kvm/Makefile
index 0a67310299a6..f621ce64363b 100644
--- a/trunk/arch/powerpc/kvm/Makefile
+++ b/trunk/arch/powerpc/kvm/Makefile
@@ -14,7 +14,7 @@ CFLAGS_emulate.o  := -I.
 
 common-objs-y += powerpc.o emulate.o
 obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o
-obj-$(CONFIG_KVM_BOOK3S_64_HANDLER) += book3s_exports.o
+obj-$(CONFIG_KVM_BOOK3S_HANDLER) += book3s_exports.o
 
 AFLAGS_booke_interrupts.o := -I$(obj)