mmap.c (79f3d123caedbac30a6fd75f9597b2a60a89d513) | mmap.c (c4d91e225ff3c9821c85ac6efd8e02c0025c0190) |
---|---|
1// SPDX-License-Identifier: GPL-2.0-only 2/* 3 * mm/mmap.c 4 * 5 * Written by obz. 6 * 7 * Address space accounting code <alan@lxorguk.ukuu.org.uk> 8 */ --- 1742 unchanged lines hidden (view full) --- 1751 /* 1752 * Expand the existing vma if possible; Note that singular lists do not 1753 * occur after forking, so the expand will only happen on new VMAs. 1754 */ 1755 if (vma && vma->vm_end == addr) { 1756 VMG_STATE(vmg, mm, vmi, addr, addr + len, flags, PHYS_PFN(addr)); 1757 1758 vmg.prev = vma; | 1// SPDX-License-Identifier: GPL-2.0-only 2/* 3 * mm/mmap.c 4 * 5 * Written by obz. 6 * 7 * Address space accounting code <alan@lxorguk.ukuu.org.uk> 8 */ --- 1742 unchanged lines hidden (view full) --- 1751 /* 1752 * Expand the existing vma if possible; Note that singular lists do not 1753 * occur after forking, so the expand will only happen on new VMAs. 1754 */ 1755 if (vma && vma->vm_end == addr) { 1756 VMG_STATE(vmg, mm, vmi, addr, addr + len, flags, PHYS_PFN(addr)); 1757 1758 vmg.prev = vma; |
1759 vma_iter_next_range(vmi); | 1759 /* vmi is positioned at prev, which this mode expects. */ 1760 vmg.merge_flags = VMG_FLAG_JUST_EXPAND; |
1760 1761 if (vma_merge_new_range(&vmg)) 1762 goto out; 1763 else if (vmg_nomem(&vmg)) 1764 goto unacct_fail; 1765 } 1766 1767 if (vma) --- 571 unchanged lines hidden --- | 1761 1762 if (vma_merge_new_range(&vmg)) 1763 goto out; 1764 else if (vmg_nomem(&vmg)) 1765 goto unacct_fail; 1766 } 1767 1768 if (vma) --- 571 unchanged lines hidden --- |