--- a/mm/memory.c~mm-use-helper-macro-min-and-max-in-unmap_mapping_range_tree +++ a/mm/memory.c @@ -3350,12 +3350,8 @@ static inline void unmap_mapping_range_t vma_interval_tree_foreach(vma, root, first_index, last_index) { vba = vma->vm_pgoff; vea = vba + vma_pages(vma) - 1; - zba = first_index; - if (zba < vba) - zba = vba; - zea = last_index; - if (zea > vea) - zea = vea; + zba = max(first_index, vba); + zea = min(last_index, vea); unmap_mapping_range_vma(vma, ((zba - vba) << PAGE_SHIFT) + vma->vm_start,