diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-20 22:08:32 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-20 22:08:32 +0200 |
| commit | b50fb7c99217922ea36d6e38bae34d84c0587cad (patch) | |
| tree | 5f46167ac7fe5cd87bbed8ca8644f32befc5bbae /arch/arc/mm/mmap.c | |
| parent | 04c848d398797a626608ff48804d809ae6687163 (diff) | |
| parent | 41f1830f5a7af77cf5c86359aba3cbd706687e52 (diff) | |
Merge branch 'linus' into irq/core
Get upstream changes so pending patches won't conflict.
Diffstat (limited to 'arch/arc/mm/mmap.c')
| -rw-r--r-- | arch/arc/mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/mm/mmap.c b/arch/arc/mm/mmap.c index 3e25e8d6486b..2e13683dfb24 100644 --- a/arch/arc/mm/mmap.c +++ b/arch/arc/mm/mmap.c @@ -65,7 +65,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, 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; } |