diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2023-08-31 13:19:55 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-08-31 13:19:55 -0400 |
commit | 0d15bf966d7d47ba9630c4fc6e04860449cc2aab (patch) | |
tree | d5f27901eec6b1a735dcae77c827608ff888ce06 /arch/x86/kvm/mmu/mmu.c | |
parent | e0fb12c673e53d2a103b9e0abc92204de0fc325d (diff) | |
parent | 458933d33af2cb3663bd8c0080c1efd1f9483db4 (diff) | |
download | lwn-0d15bf966d7d47ba9630c4fc6e04860449cc2aab.tar.gz lwn-0d15bf966d7d47ba9630c4fc6e04860449cc2aab.zip |
Merge tag 'kvm-x86-generic-6.6' of https://github.com/kvm-x86/linux into HEAD
Common KVM changes for 6.6:
- Wrap kvm_{gfn,hva}_range.pte in a union to allow mmu_notifier events to pass
action specific data without needing to constantly update the main handlers.
- Drop unused function declarations
Diffstat (limited to 'arch/x86/kvm/mmu/mmu.c')
-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 dbf3c6c2316c..7b52e31f1151 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1584,7 +1584,7 @@ static __always_inline bool kvm_handle_gfn_range(struct kvm *kvm, for_each_slot_rmap_range(range->slot, PG_LEVEL_4K, KVM_MAX_HUGEPAGE_LEVEL, range->start, range->end - 1, &iterator) ret |= handler(kvm, iterator.rmap, range->slot, iterator.gfn, - iterator.level, range->pte); + iterator.level, range->arg.pte); return ret; } |