Clean up the rmap helpers (mostly renames) to yield a more coherent set of APIs, and to purge the irritating and inconsistent "rmapp" (p is for pointer) nomenclature. Patch 1 is a tangentially related fix for a benign bug. Sean Christopherson (5): KVM: x86/mmu: Return a u64 (the old SPTE) from mmu_spte_clear_track_bits() KVM: x86/mmu: Rename rmap zap helpers to better show relationships KVM: x86/mmu: Remove underscores from __pte_list_remove() KVM: x86/mmu: Use innermost rmap zap helper when recycling rmaps KVM: x86/mmu: Drop the "p is for pointer" from rmap helpers arch/x86/kvm/mmu/mmu.c | 73 +++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 37 deletions(-) base-commit: b9b71f43683ae9d76b0989249607bbe8c9eb6c5c -- 2.37.0.144.g8ac04bfd2-goog