diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:31 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:31 +0800 |
| commit | 78278fb152735c686cb13e1ae3bcee78fc2cd154 (patch) | |
| tree | ed3f669fbb4422bf3dfaa6b20ea992c04c1eac01 /arch/tile/mm/hugetlbpage.c | |
| parent | 084eedbddaa526f53b20291ee7176be269620301 (diff) | |
| parent | 92905e331aea278665c4b27fbb13c4547a8bcbb0 (diff) | |
Merge tag 'v4.9.35' into linux-linaro-lsk-v4.9lsk-v4.9-17.06
This is the 4.9.35 stable release
Diffstat (limited to 'arch/tile/mm/hugetlbpage.c')
| -rw-r--r-- | arch/tile/mm/hugetlbpage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c index 77ceaa343fce..67508b249ede 100644 --- a/arch/tile/mm/hugetlbpage.c +++ b/arch/tile/mm/hugetlbpage.c @@ -232,7 +232,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, addr = ALIGN(addr, huge_page_size(h)); vma = find_vma(mm, addr); if (TASK_SIZE - len >= addr && - (!vma || addr + len <= vma->vm_start)) + (!vma || addr + len <= vm_start_gap(vma))) return addr; } if (current->mm->get_unmapped_area == arch_get_unmapped_area) |