From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 2 Apr 2021 11:25:32 +0000 (-0400)
Subject: Merge branch 'kvm-tdp-fix-rcu' into HEAD
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=657f1d86a38e4b5d13551948c02cc8fc6987e3a5;p=linux.git

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

657f1d86a38e4b5d13551948c02cc8fc6987e3a5
diff --cc arch/x86/kvm/mmu/tdp_mmu.c
index 08667e3cf091d,462b1f71c77f9..fd50008636784
--- a/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;