diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:00 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-30 14:26:00 +0800 |
| commit | 267aa95e09eec438abf8979b58cded5cbc5586cb (patch) | |
| tree | 7401fc52691565f31c0ad96a94a7a54971cc6e6a /fs/hugetlbfs/inode.c | |
| parent | d87abdcbf8871b5ee58083b3bdf216ba406224b9 (diff) | |
| parent | 6ee496d7218aeccffe5380cb65e9d50d1a61c323 (diff) | |
Merge tag 'v4.4.75' into linux-linaro-lsk-v4.4lsk-v4.4-17.06
This is the 4.4.75 stable release
Diffstat (limited to 'fs/hugetlbfs/inode.c')
| -rw-r--r-- | fs/hugetlbfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 595ebdb41846..a17da8b57fc6 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -191,7 +191,7 @@ 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; } |