Merge branch 'kvm-tdp-fix-rcu' into HEAD

diff --cc arch/x86/kvm/mmu/mmu_internal.h
Simple merge

diff --cc arch/x86/kvm/mmu/tdp_mmu.c
index 08667e3,462b1f7..fd50008
--- 1/arch/x86/kvm/mmu/tdp_mmu.c
--- 2/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@@ -190,13 -203,10 +190,8 @@@ static void handle_changed_spte(struct 
                                u64 old_spte, u64 new_spte, int level,
                                bool shared);
  
- static int kvm_mmu_page_as_id(struct kvm_mmu_page *sp)
- {
-       return sp->role.smm ? 1 : 0;
- }
- 
  static void handle_changed_spte_acc_track(u64 old_spte, u64 new_spte, int level)
  {
 -      bool pfn_changed = spte_to_pfn(old_spte) != spte_to_pfn(new_spte);
 -
        if (!is_shadow_present_pte(old_spte) || !is_last_spte(old_spte, level))
                return;