1 files changed, 2 insertions, 8 deletions

diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 971dfa4815f0..8ce7963ad41d 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -23,7 +23,7 @@
 #include <asm/page.h>
 #include <asm/exception-64e.h>
 #ifdef CONFIG_KVM_BOOK3S_64_HANDLER
-#include <asm/kvm_book3s_64_asm.h>
+#include <asm/kvm_book3s_asm.h>
 #endif
 
 register struct paca_struct *local_paca asm("r13");
@@ -137,15 +137,9 @@ struct paca_struct {
         u64 startpurr;                  /* PURR/TB value snapshot */
         u64 startspurr;                 /* SPURR value snapshot */
 
-#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
-        struct  {
-                u64     esid;
-                u64     vsid;
-        } kvm_slb[64];                  /* guest SLB */
+#ifdef CONFIG_KVM_BOOK3S_HANDLER
         /* We use this to store guest state in */
         struct kvmppc_book3s_shadow_vcpu shadow_vcpu;
-        u8 kvm_slb_max;                 /* highest used guest slb entry */
-        u8 kvm_in_guest;                /* are we inside the guest? */
 #endif
 };