summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-06-21 09:07:52 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-06-21 09:07:52 +0200
commitf0cd9ae5d0df8668e76359a3e0e99856aa9c53b9 (patch)
tree84d3297b16fa7e373f2eabef56cd12ae5a9b8a29 /arch/sh
parent098b0e01a91c42aaaf0425605cd126b03fcb0bcf (diff)
parent8e6cec1c7c5afa489687c90be15d6ed82c742975 (diff)
downloadlinux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.tar.gz
linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.tar.bz2
linux-f0cd9ae5d0df8668e76359a3e0e99856aa9c53b9.zip
Merge branch 'timers/urgent' into timers/core
Pick up dependent changes.
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/mm/mmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
index 08e7af0be4a7..6a1a1297baae 100644
--- a/arch/sh/mm/mmap.c
+++ b/arch/sh/mm/mmap.c
@@ -64,7 +64,7 @@ unsigned long 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;
}
@@ -114,7 +114,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
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;
}