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/mips/mm/mmap.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/mips/mm/mmap.c')
-rw-r--r-- | arch/mips/mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c index d08ea3ff0f53..a44052c05f93 100644 --- a/arch/mips/mm/mmap.c +++ b/arch/mips/mm/mmap.c @@ -92,7 +92,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp, 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; } |