diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-08-10 13:45:26 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-08-10 13:45:26 -0400 |
| commit | c3e9434c9852c09cd1756b05d1474b7c84452819 (patch) | |
| tree | 15c0dff034fcea01c6a48b9eae91c79e5e379866 /arch/x86/kvm/mmu | |
| parent | 32bdc01988413031c6e743714c2b40bdd773e5db (diff) | |
| parent | 7b9cae027ba3aaac295ae23a62f47876ed97da73 (diff) | |
| download | linux-c3e9434c9852c09cd1756b05d1474b7c84452819.tar.bz2 | |
Merge branch 'kvm-vmx-secctl' into HEAD
Merge common topic branch for 5.14-rc6 and 5.15 merge window.
Diffstat (limited to 'arch/x86/kvm/mmu')
| -rw-r--r-- | arch/x86/kvm/mmu/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 964c797dcc46..bdf8197d6f84 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1684,7 +1684,7 @@ static int is_empty_shadow_page(u64 *spt) * aggregate version in order to make the slab shrinker * faster */ -static inline void kvm_mod_used_mmu_pages(struct kvm *kvm, unsigned long nr) +static inline void kvm_mod_used_mmu_pages(struct kvm *kvm, long nr) { kvm->arch.n_used_mmu_pages += nr; percpu_counter_add(&kvm_total_used_mmu_pages, nr); |