diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:19:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:19:14 +0200 |
| commit | f9e169883164390a15b56d00cb7e22c2e72f4dba (patch) | |
| tree | 2a946cfff76d6dd41005d0dd534e0bd97641019d /arch/tile | |
| parent | cde50a67397c0da7d11795d4b4418384022ab8e6 (diff) | |
| parent | 8d829b9bb878904f3419af8003176a12910b94e8 (diff) | |
| download | linux-f9e169883164390a15b56d00cb7e22c2e72f4dba.tar.bz2 | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/tile')
| -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 cb10153b5c9f..03e5cc4e76e4 100644 --- a/arch/tile/mm/hugetlbpage.c +++ b/arch/tile/mm/hugetlbpage.c @@ -233,7 +233,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) |