1 files changed, 2 insertions, 4 deletions

diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index e372ed871c51..3aa5b577cd60 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -235,10 +235,7 @@ struct revmap_entry {
  */
 #define KVMPPC_RMAP_LOCK_BIT    63
 #define KVMPPC_RMAP_RC_SHIFT    32
-#define KVMPPC_RMAP_CHG_SHIFT   48
 #define KVMPPC_RMAP_REFERENCED  (HPTE_R_R << KVMPPC_RMAP_RC_SHIFT)
-#define KVMPPC_RMAP_CHANGED     (HPTE_R_C << KVMPPC_RMAP_RC_SHIFT)
-#define KVMPPC_RMAP_CHG_ORDER   (0x3ful << KVMPPC_RMAP_CHG_SHIFT)
 #define KVMPPC_RMAP_PRESENT     0x100000000ul
 #define KVMPPC_RMAP_INDEX       0xfffffffful
 
@@ -276,7 +273,7 @@ struct kvm_arch {
         int tlbie_lock;
         unsigned long lpcr;
         unsigned long vrma_slb_v;
-        int hpte_setup_done;
+        int mmu_ready;
         atomic_t vcpus_running;
         u32 online_vcores;
         atomic_t hpte_mod_interest;
@@ -284,6 +281,7 @@ struct kvm_arch {
         cpumask_t cpu_in_guest;
         u8 radix;
         u8 fwnmi_enabled;
+        bool threads_indep;
         pgd_t *pgtable;
         u64 process_table;
         struct dentry *debugfs_dir;