From dcedb38219cd57bc996e968cd45e6d034c20f496 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 19 May 2005 15:29:23 -0700 Subject: [PATCH] --- yaml --- r: 1270 b: refs/heads/master c: 804c64ea864d0a8ee13f3de0b74158a3e9c3166d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/mmap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eedf66658bb5..a26312406aa1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa1c6a6f7f0518b42994d02756a41cbfdcac1916 +refs/heads/master: 804c64ea864d0a8ee13f3de0b74158a3e9c3166d diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c index 01f9793591f6..63df2d698414 100644 --- a/trunk/mm/mmap.c +++ b/trunk/mm/mmap.c @@ -1244,7 +1244,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, addr = mm->free_area_cache; /* make sure it can fit in the remaining address space */ - if (addr >= len) { + if (addr > len) { vma = find_vma(mm, addr-len); if (!vma || addr <= vma->vm_start) /* remember the address as a hint for next time */ @@ -1266,7 +1266,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, /* try just below the current vma->vm_start */ addr = vma->vm_start-len; - } while (len <= vma->vm_start); + } while (len < vma->vm_start); /* * A failed mmap() very likely causes application failure,